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

src/views/distribution/reservation/reservationAddFrom.vue

@@ -1052,16 +1052,16 @@ export default {
           sortable: true,
         },
 
-        // {
-        //   prop: '',
-        //   label: '操作',
-        //   type: 6,
-        //   values: '',
-        //   width: '200',
-        //   checkarr: [],
-        //   fixed: 'right',
-        //   hide: true,
-        // },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
         // 更多列的配置...
       ],
       stockArtcolumnList: [
@@ -2376,10 +2376,10 @@ export default {
       let stockArticleList = [];
       let operation = true;
       this.inventoryData.forEach(item => {
-        if (item.reservationNum === '0' || item.reservationNum > item.quantityStock) {
+        if (Number(item.reservationNum) === 0 || item.reservationNum > item.quantityStock) {
           this.$message({
             type: 'warning',
-            message: '请输入' + item.orderCode + '正确数量!',
+            message: '存在无效的预约数量',
           });
           operation = false;
           return;

src/views/distribution/reservation/reservationDetails.vue

@@ -704,6 +704,17 @@
           }
         ],
         stockListColumnList:[
+          {
+            prop: 'incomingBatch',
+            label: '入库批次号',
+            type: 2,
+            values: '',
+            width: '160',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false
+          },
           {
             prop: 'orderCode',
             label: '订单自编号',

src/views/mail/order/add.vue

@@ -604,7 +604,7 @@
 
 <script>
   import {
-    autonomouslySave,
+    add,
     update,
     remove,
     getReservationInfo,
@@ -2418,10 +2418,10 @@
         let stockArticleList = [];
         let operation = true;
         this.inventoryData.forEach(item => {
-          if (item.reservationNum === '0' || item.reservationNum > item.quantityStock) {
+          if (Number(item.reservationNum) === 0 || item.reservationNum > item.quantityStock) {
             this.$message({
               type: 'warning',
-              message: '请输入' + item.orderCode + '正确数量!',
+              message: '存在无效的预约数量',
             });
             operation = false;
             return;
@@ -2482,9 +2482,14 @@
         }
         // this.form.stockArticleList = this.packageList;
         console.log('>>>>>>>>', this.form);
+        console.log("this.reservationId >>>>>",this.reservationId)
         if (this.reservationId) {
+          console.log('>>>>>>>> update');
+          this.form.warehouseId = this.warehouseId;
           this.form.id = this.reservationId;
-          update(this.form).then(() => {
+          update(this.form).then((res) => {
+            if(res.data.code !== 200) return
+
             this.$router.go(-1);
             this.$message({
               type: 'success',
@@ -2492,8 +2497,10 @@
             });
           });
         } else {
-          this.form.reservationStatus = '20';
-          autonomouslySave(this.form).then(() => {
+          console.log('>>>>>>>> add');
+          this.form.warehouseId = this.warehouseId;
+          add(this.form).then((res) => {
+            if(res.data.code !== 200) return
             this.$message({
               type: 'success',
               message: '操作成功!',

src/views/mail/reservation/list.vue

@@ -44,8 +44,8 @@
                 <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
                   >添加预约
                 </el-button>
-           
-             
+
+
                 <el-button type="danger" icon="el-icon-download" @click="handleExportInfo(1)" plain
                   >导出
                 </el-button>
@@ -80,7 +80,7 @@
                     @click="viewReservation(slotProps.scope)"
                     >查看
                   </el-text>
-            
+
                   <el-text
                     size="small"
                     type="primary"
@@ -89,7 +89,7 @@
                     @click="cancelReservation(slotProps.scope)"
                     >取消预约
                   </el-text>
-              
+
                 </template>
               </tablecmt>
             </template>
@@ -103,7 +103,7 @@
             <div class="avue-crud__header">
               <!-- 头部左侧按钮模块 -->
               <div class="avue-crud__left">
-                
+
                 <el-button type="danger" icon="el-icon-download" @click="handleExportInfo(2)" plain
                   >导出
                 </el-button>
@@ -138,7 +138,7 @@
                     @click="viewReservation(slotProps.scope)"
                     >查看
                   </el-text>
-                  
+
                 </template>
               </tablecmt>
             </template>
@@ -410,7 +410,7 @@ export default {
           fixed: false,
           sortable: true,
         },
-   
+
         {
           prop: 'periodOfTimeName',
           label: '时段',
@@ -1365,10 +1365,10 @@ export default {
       //   this.query.reservationStatus = '1';
       // }
       let query = this.queryB;
-      query.reservationStatus = '2';
+      query.reservationStatus = '20';
       if (this.activename === 'nocheck') {
         query = this.queryA;
-        query.reservationStatus = this.queryA.reservationStatus || '1';
+        query.reservationStatus= '10';
       }
       // if (this.queryA.reservationStatus)
       getReservationList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
@@ -1381,7 +1381,7 @@ export default {
                 item.orderSource = a.dictValue;
               }
             });
-    
+
             this.resvervationStatusData.forEach(e => {
               if (item.reservationStatus === e.dictKey) {
                 item.reservationStatus = e.dictValue;