修改自提

src/api/distribution/distrilbutionBillLading.js

@@ -12,6 +12,18 @@ export const getList = (current, size, params) => {
   })
 }
 
+export const getListOwn = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distrilbutionBillLading/listOwn',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
 export const getDetail = (id) => {
   return request({
     url: '/api/logpm-distribution/distrilbutionBillLading/detail',

src/option/distribution/distrilbutionBillLading.js

@@ -334,56 +334,56 @@ export default {
     },
     {
       label: "服务号",
-      prop: "pickUpTime",
+      prop: "serviceNumber",
       width: 170
     },
     {
       label: "运单号",
-      prop: "pickUpTime",
+      prop: "waybillNumber",
       width: 170
     },
     {
       label: "收货单位",
-      prop: "pickUpTime",
+      prop: "consigneeUnit",
       width: 170
     },
     {
       label: "收货人",
-      prop: "pickUpTime",
+      prop: "customerName",
       width: 170
     },
     {
       label: "联系电话",
-      prop: "pickUpTime",
+      prop: "customerTelephone",
       width: 170
     },
     {
       label: "仓库",
-      prop: "pickUpTime",
+      prop: "warehouse",
       width: 170
     },
     {
       label: "入库时间",
-      prop: "pickUpTime",
+      prop: "warehouseEntryTime",
       width: 170
     },
     {
       label: "到付运费",
-      prop: "pickUpTime",
+      prop: "collect_fee",
       width: 170
     },
     {
       label: "搬运费",
-      prop: "pickUpTime",
+      prop: "transport",
       width: 170
     },
     {
       label: "仓储费",
-      prop: "pickUpTime",
+      prop: "storageFee",
     },
     {
       label: "叉车费",
-      prop: "pickUpTime",
+      prop: "forklift",
     },
     {
       label: "总费用",
@@ -391,19 +391,19 @@ export default {
     },
     {
       label: "应提件数",
-      prop: "pickUpTime",
+      prop: "totalNumber",
     },
     {
       label: "实提件数",
-      prop: "pickUpTime",
+      prop: "handQuantity",
     },
     {
       label: "品牌",
-      prop: "pickUpTime",
+      prop: "brand",
     },
     {
       label: "服务类型",
-      prop: "pickUpTime",
+      prop: "typeService",
       width: 170
     },
     {
@@ -415,11 +415,6 @@ export default {
       label: "提货手机",
       prop: "pickUpTime",
     },
-    {
-      label: "提货时间",
-      prop: "pickUpTime",
-      width: 170
-    },
     {
       label: "备注",
       prop: "pickUpTime",

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

@@ -412,17 +412,7 @@ 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) =>
@@ -525,7 +515,7 @@ export default {
           })
           break;
         case '3':
-          console.log("客户信息！！！",this.formCustomer);
+          // console.log("客户信息！！！",this.formCustomer);
           this.formCustomer.stockArticleId = this.ids;
           addClient(this.formCustomer).then(() =>{
             this.$message({

src/views/distribution/inventory/distrilbutionBillLading.vue

@@ -526,9 +526,9 @@ export default {
     callFordelivery(inde){
       this.dialogFormVisible = false;
       this.selectionListStock.some( i =>{
-        console.log("asdgfasdv",i);
+        // console.log("asdgfasdv",i);
         let a = this.data.filter((ele) => ele.id == i.id ).length >= 1
-        console.log("asdgfasdv",a);
+        // console.log("asdgfasdv",a);
         if(!a){
           this.data.push(i);
         }
@@ -631,19 +631,52 @@ export default {
         let fei = new Map();
         await this.bianLier(this.costListName,this.clientType,this.costList,fei);
         this.form.fei = Object.fromEntries(fei);
-        this.form.stockArticleId = this.$route.query.ids;
+        this.form.stockArticleId = this.$route.query.id;
+        this.form.stockDTOList = this.data;
+        let o = [];
+        if(this.fileListClerk.length > 0){
+          this.fileListClerk.forEach( i =>{
+            // console.log("iiii",i);
+            let num = {};
+            num.state = "2";
+            num.name = i.response.data.name;
+            num.url = i.response.data.link;
+            o.push(num);
+          });
+
+        }else if(this.fileListLibrary.length > 0){
+          this.fileListLibrary.forEach( i =>{
+            let num = {};
+            num.state = "3";
+            num.name = i.response.data.name;
+            num.url = i.response.data.link;
+            o.push(num);
+          });
+
+        }else if(this.fileListSell.length > 0){
+          this.fileListSell.forEach( i =>{
+            // console.log(",.,.,.,.",i);
+            let num = {};
+            num.state = "1";
+            num.name = i.response.data.name;
+            num.url = i.response.data.link;
+            o.push(num);
+          });
+        }
+        this.form.printList = o.length > 0 ? o : [];
+
         console.log("this.form",this.form);
-        // add(this.form).then(() => {
+        add(this.form).then(() => {
-        //   this.box = false;
+          this.box = false;
-        //   this.onLoad(this.page);
+          this.onLoad(this.page);
-        //   this.$message({
+          this.$message({
-        //     type: "success",
+            type: "success",
-        //     message: "操作成功!"
+            message: "操作成功!"
-        //   });
+          });
-        //   this.contextmenuFlag = false;
+          this.contextmenuFlag = false;
-        //   this.$store.commit('DEL_TAG_CURRENT');
+          this.$store.commit('DEL_TAG_CURRENT');
-        //   this.$router.push(this.tagWel);
+          this.$router.push(this.tagWel);
-        // });
+        });
       } else {
         update(this.form).then(() => {
           this.box = false;

src/views/distribution/inventory/distrilbutionBillLadingList.vue

@@ -57,7 +57,9 @@
             <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-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>
             </template>
           </el-table-column>
         </el-table>
@@ -276,7 +278,7 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove } from "@/api/distribution/distrilbutionBillLading";
+import { getList, getDetail, add, update, remove,getListOwn } from "@/api/distribution/distrilbutionBillLading";
 import option from "@/option/distribution/distrilbutionBillLading";
 import { mapGetters } from "vuex";
 import { getDictionaryBiz } from '@/api/system/dict';
@@ -316,14 +318,7 @@ export default {
       costList: [],
       costListName: [],
       certificateType: [],
-      fileList:[ {
+
-        name: 'food.jpeg',
-        url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
-      },
-        {
-          name: 'food2.jpeg',
-          url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
-        },]
     }
   },
   mounted () {
@@ -531,10 +526,34 @@ export default {
     },
     onLoad (page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
+        console.log("???????",data);
         this.page.total = data.total;
         this.data = data.records;
+        this.data.forEach( i => {
+          if(!!i.list){
+            i.list.forEach(a =>{
+              switch (a.cost){
+                case '1':
+
+                  break;
+                case '2':
+                  break;
+                case '3':
+                  console.log("0=-0-=");
+                  // this.$set(i,i.transport ,a.money);
+                  i.transport = a.money
+                  break;
+                case '4':
+                  // this.$set(i,i.forklift ,a.money);
+                  i.forklift = a.money
+                  break;
+              }
+            })
+          }
+        })
+        console.log(this.data);
         this.loading = false;
         this.selectionClear();
       });