代码提交

src/HDrpManagement/toolBorrowingMag/detail/tabs/toolList.vue

@@ -1,14 +1,23 @@
 <template>
   <div>
-    <addProduct :data="data" @onConfirm="listData()"></addProduct>
+    <addProduct class="inline-16" :data="data" @onConfirm="listData()"></addProduct>
+    <el-button size="small" type="primary" @click="adddispatch">一键发货</el-button>
     <el-table
       ref="multipleTable"
       :data="tableData"
       height="500px"
       style="width: 100%;"
       size="small"
+      @selection-change	="selectionChange">
       stripe
-      border>
+      border
+      >
+      <el-table-column
+        type="selection"
+        width="55"
+        fixed="left"
+        align="center">
+      </el-table-column>
       <el-table-column
         prop="itemname"
         label="产品名称"
@@ -186,7 +195,7 @@ export default {
         "content": {
           "sa_orderid": 0, //订单ID
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 9999,
           "where": {
             "condition": ""
           }
@@ -197,6 +206,7 @@ export default {
           return time.getTime() < (Date.now() - 24 * 3600 * 1000);
         },
       },
+      selection:[],
       total:0,
       currentPage:0,
       time: null,
@@ -317,6 +327,29 @@ export default {
         },
       })
     },
+    selectionChange (selection) {
+      this.$emit('select',selection)
+    },
+    async adddispatch () {
+      const res = await this.$api.requested({
+        "id": "20230220100604",
+        "content": {
+          "sa_orderid":this.data.sa_orderid,
+          "sa_orderitemsids": this.selection.map(e=>{
+            return e.sa_orderitemsid
+          })
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        let route = this.$route
+
+        this.oldRoute = {path:route.path,query:route.query}
+
+        this.$store.dispatch('setHistoryRouter',this.oldRoute)
+
+        this.$router.replace({path:'/dispatchdetail',query:{id:res.data.sa_dispatchid,rowindex:res.data.rowindex}})
+      })
+    },
   },
   mounted () {
     this.listData()

src/SDrpManagement/shopCart/modules/confirmOrder.vue

@@ -320,7 +320,7 @@ export default {
           // "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
           "rec_contactsid": this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
           "remarks": this.defaultData.remarks, //可选
-          "tradefield":this.data[0].tradefield_shoppingcart,
+          "tradefield":this.istool == 0?this.data[0].tradefield_shoppingcart:"",
           "items": this.data.map(e=>{
             return {
               "sa_orderitemsid": 0, //写死0

src/SDrpManagement/shopCart/modules/list.vue

@@ -164,15 +164,19 @@ export default {
     },
     selectionChange (val) {
       this.tableSelectData = val
-      let _isbrandSame = this.tableSelectData.some(item=>item.sa_brandid !== this.tableSelectData[0].sa_brandid)
+      if (this.params.content.istool == 0) {
+         let _isbrandSame = this.tableSelectData.some(item=>item.sa_brandid !== this.tableSelectData[0].sa_brandid)
 
-      if (_isbrandSame) return this.$message({message:"当前存在不同品牌产品请检查",type:'error'})
+        if (_isbrandSame) return this.$message({message:"当前存在不同品牌产品请检查",type:'error'})
 
-      let _isFieldSame = this.tableSelectData.some(item=>item.tradefield_shoppingcart !== this.tableSelectData[0].tradefield_shoppingcart)
+        let _isFieldSame = this.tableSelectData.some(item=>item.tradefield_shoppingcart !== this.tableSelectData[0].tradefield_shoppingcart)
 
-       if (_isFieldSame) return this.$message({message:"当前存在不同领域产品请检查",type:'error'})
+        if (_isFieldSame) return this.$message({message:"当前存在不同领域产品请检查",type:'error'})
 
-      this.$emit('selection',val)
+        this.$emit('selection',val)
+      } else {
+        this.$emit('selection',val)
+      }
     },
     clearSelection () {
       this.$refs.multipleTable.clearSelection();

src/SDrpManagement/shopCart/modules/total.vue

@@ -60,7 +60,7 @@ export default {
         "id": 20221128183202,
         "content": {
           "istool":this.istool,
-           "tradefield":this.data[0].tradefield_shoppingcart,
+           "tradefield":this.istool ==0 ?this.data[0].tradefield_shoppingcart:'',
           "items": this.data.map(e=>{
             return {
               "sa_orderitemsid": 0, //写死0

src/components/socketMessage/index.vue

@@ -80,10 +80,9 @@
       },
       getMessage: function (msg) {
         if(msg.data !== 'alive') {
+          // console.log(JSON.parse(msg.data).message.class === 'remind')
           this.panelIsShow = true
-          console.log(msg.data)
           this.list = [JSON.parse(msg.data).message]
-          console.log(this.list)
           this.getMessageList()
         }
       },