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

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

@@ -1105,7 +1105,7 @@ export default {
       // 返回false,说明全都相等
       if (!notEqualFlag) {
         this.$router.push({
-          path: '/distribution/inventory/distributionStockArticleFrom',
+          path: '/distribution/reservation/reservationSubmitFrom',
           query: {
             id: this.ids,
             name: '转预约单',

src/views/distribution/inventory/distrilbutionBillLadingList.vue

@@ -943,16 +943,17 @@ export default {
     },
     //签收
     handleSign(row, num) {
-      if (this.selectionList.length == 0) {
+      if(num === 2){
-        this.$message.warning('至少选择一条数据！！');
+        if (this.selectionList.length == 0) {
-        return;
+          this.$message.warning('至少选择一条数据！！');
-      }
+          return;
-      let a = this.selectionList.find(i => i.conditions > 6);
+        }
-      if (!!a) {
+        let a = this.selectionList.find(i => i.conditions > 20);
-        this.$message.warning('有已签收的数据，请勿重复签收！！');
+        if (!!a) {
-        return;
+          this.$message.warning('有已签收的数据，请勿重复签收！！');
+          return;
+        }
       }
-
       this.$confirm('确定签收吗?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

src/views/distribution/inventory/distrilbutionBillLadingView.vue

@@ -318,7 +318,7 @@ export default {
             head: false,
           },
           {
-            prop: 'deliveryNumber',
+            prop: 'quantity',
             label: '备货数',
             type: 2,
             values: '',
@@ -329,7 +329,7 @@ export default {
             head: false,
           },
           {
-            prop: 'readyStock',
+            prop: 'preparedQuantity',
             label: '已备数量',
             type: 2,
             values: '',