修改转库存品

src/api/distribution/distributionStockArticle.js

@@ -39,6 +39,13 @@ export const add = (row) => {
     data: row
   })
 }
+export const addStockRow = (row) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockArticle/saveStockRow',
+    method: 'post',
+    data: row
+  })
+}
 
 export const addStock = (ids) => {
   return request({

src/option/distribution/distributionStockArticleFrom.js

@@ -132,6 +132,7 @@ export default {
     {
       label: "转库存品数量",
       prop: "inventoryQuantity",
+      hide: true,
     },
     {
       label: "车次号",

src/views/distribution/inventory/distributionStockArticle.vue

@@ -330,6 +330,7 @@
 
 <script>
 import { getList, getDetail, add, update, remove,addStock } from "@/api/distribution/distributionStockArticle";
+import { getListOwn } from "@/api/distribution/distributionParcelList";
 import { addCallDelivery } from "@/api/distribution/distrilbutionCallDelivery";
 import { addClient } from "@/api/distribution/distributionClientMessage";
 import { addService } from "@/api/distribution/distributionServiceLog";
@@ -410,47 +411,88 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }
+      let a = '';
+      let b = '';
+      let c = '';
+      let d = true;
+      this.selectionList.forEach( i =>{
+        if(!!a){
+
+        }else{
+          a = i.customerName
+        }
+      })
+      // 判断orderId是否全都相等
+      const notEqualFlag = this.selectionList.some(
+        (item) =>
+          this.selectionList.filter((ele) =>
+            ele.customerName !== item.customerName
+            && ele.customerTelephone !== item.customerTelephone
+            && ele.customerAddress !== item.customerAddress ).length >= 1
+      );
+      console.log("notEqualFlag=====",notEqualFlag);
+      // 返回true,说明有不同
+      // 返回false,说明全都相等
+    if(!notEqualFlag){
       this.$router.push({
         path: '/distribution/reservation/reservationFrom',
         query:{
           id: this.ids,
           name: '添加预约单'
 
-
         }
       });
+
+    }else{
+      this.$message.warning("请选择相同收货信息的订单！！！")
+
+    }
+
     },
-    handleStockList(){
+    async handleStockList(){
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
         return;
-      }
-      this.$router.push({
-        path: '/distribution/inventory/distributionStockArticleFrom',
-        query: {
-          id : this.ids,
-          name : "转库存单"
+      }else if (this.selectionList.length > 1){
+        this.getSock();
+      }else if (this.selectionList.length < 2){
+        //判断有没有包件
+        let params ={
+          stockArticleId : this.selectionList[0].id
         }
-      });
 
-
-      //
-      // this.$confirm("确定将选择的订单转为库存品吗？", {
-      //   confirmButtonText: "确定",
-      //   cancelButtonText: "取消",
-      //   type: "warning"
-      // })
-      //   .then(() => {
-      //     return addStock(this.ids);
-      //   })
-      //   .then(() => {
-      //     this.selectionClear();
-      //     this.onLoad(this.page);
-      //     this.$message({
-      //       type: "success",
-      //       message: "操作成功!"
-      //     });
-      //   });
+      let a =  await  getListOwn(this.page.currentPage,this.page.pageSize,params);
+        console.log("aaaaaaa===",a.data.data);
+        if(a.data.data.records.length > 0){
+          this.$router.push({
+            path: '/distribution/inventory/distributionStockArticleFrom',
+            query: {
+              id : this.ids,
+              name : "转库存单"
+            }
+          });
+        }else{
+          this.getSock();
+        }
+      }
+    },
+    getSock(){
+      this.$confirm("确定将选择的订单转为库存品吗？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return addStock(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
     },
     //确定通知提货按钮
     callFordelivery(inde){

src/views/distribution/inventory/distributionStockArticleFrom.vue

@@ -1,6 +1,13 @@
 <template>
   <basic-container>
     <div class="avue-crud">
+      <div class="avue-crud__header">
+        <!-- 头部左侧按钮模块 -->
+        <div class="avue-crud__left">
+          <el-button type="primary" icon="el-icon-plus" @click="handleTrade">确定</el-button>
+        </div>
+
+      </div>
       <el-row>
         <!-- 列表模块 -->
         <el-table ref="table" v-loading="loading"
@@ -22,14 +29,21 @@
                              :key="index">
             </el-table-column>
           </template>
-          <!-- 操作栏模块 -->
-          <el-table-column prop="menu" label="操作" :width="220" align="center">
+          <el-table-column prop="menu" label="转库存品数量" :width="220" align="center">
             <template #="{row}">
-              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
-              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
-              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
+<!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
+<!--              <el-input v-model="row.inventoryQuantity"  @blur="handleNumberRange($event,row)" :disabled= !this.ids.includes(row.id) ></el-input>-->
+              <el-input v-model="row.quantity" disabled ></el-input>
             </template>
           </el-table-column>
+          <!-- 操作栏模块 -->
+<!--          <el-table-column prop="menu" label="操作" :width="220" align="center">-->
+<!--            <template #="{row}">-->
+<!--              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
+<!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
+<!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
         </el-table>
       </el-row>
       <el-row>
@@ -55,6 +69,7 @@
 import { getList, getDetail, add, update, remove } from "@/api/distribution/distributionParcelList";
 import option from "@/option/distribution/distributionStockArticleFrom";
 import { mapGetters } from "vuex";
+import { addStockRow } from '@/api/distribution/distributionStockArticle';
 
 export default {
   data () {
@@ -103,6 +118,37 @@ export default {
     }
   },
   methods: {
+    handleTrade(){
+      if(this.ids.length > 0){
+        let par ={
+          ids : this.ids,
+          id: this.$route.query.id
+        }
+        let a = addStockRow(par);
+        console.log(">>>>===",a.data);
+        if(a.data.success){
+          this.onLoad(this.page);
+        }
+      }else{
+        this.$message.warning("请选择需要转的包件信息！！！");
+      }
+
+    },
+    //数量校验
+    handleNumberRange(e,row) {
+      console.log("执行了2222",e,e.target.value,row);
+      if(e.target.value) {
+        e.target.value = e.target.value.replace(/[^\.\d]/g,'') //替换掉与数字无关的字符（中英文与符号都会被替换掉，只留下数字，此时值类型为字符串）
+        if(e.target.value) { //如果替换后还有值
+          e.target.value = parseInt(e.target.value); //把字符型转成整数型
+        }
+        if((e.target.value > row.quantity )) {
+          this.$message.error('数量不能大于订单数')
+          e.target.value = row.quantity;
+          return
+        }
+      }
+    },
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
@@ -204,6 +250,7 @@ export default {
     },
     selectionChange (list) {
       this.selectionList = list;
+      console.log("<><><><><==",list);
     },
     selectionClear () {
       this.selectionList = [];
@@ -219,6 +266,8 @@ export default {
     },
     onLoad (page, params = {}) {
       this.loading = true;
+      this.query.stockArticleId = this.$route.query.id;
+      this.query.conditions = "1";
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;