自提增加限制

src/api/distribution/distributionParcelList.js

@@ -157,3 +157,12 @@ export const $_distributionParcelList = params => {
     responseType: 'blob',
   });
 };
+
+// 移除包件判断
+export const $_judgmentRemove = params => {
+  return request({
+    url: '/api/logpm-distribution/distrilbutionBillStock/judgmentRemove',
+    method: 'get',
+    params,
+  });
+};

src/views/aftersales/aftersalesWorkOrder.vue

@@ -2372,6 +2372,16 @@ const appealAll = () => {
 };
 // 确定理赔金额
 const DetermineClaims = val => {
+  ElMessageBox.confirm(
+    '是否确认理赔金额?',
+    '提示',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
   console.log(val.row);
   let data = {
     id: val.row.lawoId,
@@ -2391,6 +2401,8 @@ const DetermineClaims = val => {
       details.loadingObj.list = false; //关闭动画加载
       pageLoad.value=false
     });
+    })
+    .catch(() => {})
 };
 // 理赔金额未出编辑操作
 const Resultediting = val => {
@@ -3350,7 +3362,7 @@ const fellSuccess = (response, uploadFile) => {
     KFfeel.value = response.data.link;
   }
 };
-// 处理结果和理赔确定
+//批量审核（由客服经理批量审核确定）
 const DetermineStorage = val => {
   if (!details.selectionList.length) {
     ElMessage({
@@ -3359,14 +3371,24 @@ const DetermineStorage = val => {
     });
     return;
   }
-  let data = {
+  ElMessageBox.confirm(
+    '是否确定确定批量审核?',
+    '提示',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+      let data = {
     assignList: [],
   };
   data['assignList'] = details.selectionList.map(item => item.id);
-
   details.loadingObj.list = true; //开启加载效果
   pageLoad.value=true
   // 完结结果确定
+  console.log(data, '处理好的值');
   $_updateManagerConfirmed(data)
     .then(res => {
       if (res.data.code == 200) {
@@ -3385,8 +3407,8 @@ const DetermineStorage = val => {
       details.loadingObj.list = false; //关闭加载效果
       pageLoad.value=false
     });
-  // 赔款方
-  console.log(data, '处理好的值');
+    })
+    .catch(() => { })
 };
 
 // 完结里面确定按钮

src/views/basicdata/brand/basicClient.vue

@@ -1675,9 +1675,9 @@ export default {
     handleClose(res) {
       this.loadingObj.UploadLoadong = false;
       // UploadAjaxError
-      const msg = res.msg ? res.data.msg || '上传失败' : '上传失败';
-
-      this.$message.warning(res.msg || '上传失败');
+      let msgData = JSON.parse(res['message'])
+      console.log(msgData,'msgData');
+      this.$message.warning(msgData.msg || '上传失败');
     },
   },
 };

src/views/distribution/inventory/distributionStockListDetails.vue

@@ -440,6 +440,18 @@ export default {
             sortable: true,
             head: false,
           },
+          {
+            prop: 'storageLocation',
+            label: '存放位置',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          
           {
             prop: '',
             label: '操作',

src/views/distribution/inventory/distrilbutionBillLading.vue

@@ -640,9 +640,14 @@ import {
   remove,
   zeroMaterial,
   zeroUpdateMaterial,
+  $_distrilbutionBillLading
 } from '@/api/distribution/distrilbutionBillLading';
-import { ElMessage } from 'element-plus';
-import { getListOwn, getList, getEditList ,$_getBillLadingPackageIds} from '@/api/distribution/distributionParcelList';
+
+
+
+
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { getListOwn, getList, getEditList ,$_getBillLadingPackageIds,$_judgmentRemove} from '@/api/distribution/distributionParcelList';
 import option from '@/option/distribution/distrilbutionBillLading';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
@@ -654,6 +659,7 @@ import { detail } from '@/api/flow/flow';
 import { nextTick, ref } from 'vue';
 import { useStore } from 'vuex';
 import { setNodeHeight } from '@/utils/util.js';
+import error from '@/error';
 const $store = useStore();
 export default {
   name: '/distribution/inventory/distrilbutionBillLading',
@@ -2214,6 +2220,9 @@ export default {
     },
     //移除数据
     rowOrder(row) {
+  
+      
+
       this.dataList.forEach(i => {
         if (i.id === row.id) {
           this.dataList;
@@ -2223,8 +2232,41 @@ export default {
         if (item.id == row.id) {
           return true;
         }
-      });
-      this.dataList.splice(id1, 1);
+      })
+      if(this.$route.query.id){
+        let data={
+          billLadingId:this.$route.query.id,
+          orderId:this.dataList[id1].id
+        }
+        $_judgmentRemove(data).then(res=>{
+          console.log(res);
+          if(res.data.code == 200){
+            if(res.data.data){
+              ElMessageBox.confirm(
+              '是否移除该订单?',
+              '提示',
+            {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+            }
+          )
+            .then(() => {
+              this.dataList.splice(id1, 1);
+            })
+            .catch(() => {})
+            }else{
+            ElMessage({
+            message: '存在签收数据,无法移除该订单',
+            type: 'warning',
+            plain: true,
+          })
+            }
+          }
+        })
+      }else{
+        this.dataList.splice(id1, 1);
+      }
     },
     //订单选择确定
     callFordeliveryOrder() {
@@ -2740,6 +2782,62 @@ console.log('删除的数据对象:', deletedObjects);
     },
     // 最后提交
     async handleSubmit() {
+
+      if(!this.$route.query.id){
+        if(!this.dataList.length && !this.data.length){
+        ElMessage({
+          message: '不能做空计划，请选择定制品或者库存品',
+          type: 'warning',
+        })
+        return
+      }
+      }
+
+
+    if(this.$route.query.id){
+      if(!this.dataList.length && !this.data.length){
+    await ElMessageBox.confirm(
+    '没有选择订单，是否移除该自提任务?',
+    '提示',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+      let data={
+          billLodingIds:this.$route.query.id
+        }
+        this.Selfpickuploading = true; //关闭加载效果
+        $_distrilbutionBillLading(data).then(res=>{
+          console.log(res);
+          if(res.data.code == 200){
+            ElMessage({
+              message: res.data.msg,
+              type: 'success',
+            })
+          }
+          this.Selfpickuploading = false; //关闭加载效果
+                this.$store.commit('DEL_TAG_CURRENT');
+                this.$store.commit('EDIT_REFRESHITEM', {
+                  title: 'distrilbutionBillLadingList',
+                  status: true,
+                });
+                this.$router.push('/distribution/inventory/distrilbutionBillLadingList');
+            }).catch(error=>{
+              console.log(error,'error');
+              this.Selfpickuploading = false; //关闭加载效果
+            })
+      
+    })
+    .catch(() => {})
+    return
+      }
+    }
+
+
+
       // console.log(this.dataList,'this.dataList');
 
       // if (this.$route.query.type !== '2') {

src/views/distribution/inventory/distrilbutionBillLadingView.vue

@@ -55,8 +55,9 @@
       </div>
 
       <el-divider>订单列表</el-divider>
+      
+      <el-button style=" margin-bottom: 10px;" type="primary" icon="Position" @click="Listexport">导出</el-button>
       <el-tabs type="border-card" v-model="activeTab" @tab-click="handleTabClick">
-                  <el-button style=" margin-bottom: 10px;" type="primary" icon="Position" @click="Listexport">导出</el-button>
         <el-tab-pane label="订 单 列 表" name="tab2">
           <!-- <el-button type="primary" icon="Position" @click="Orderexport">订单导出</el-button> -->
           <!-- 列表模块 -->

src/views/distribution/signfor/distributionSignforedt.vue

@@ -370,8 +370,8 @@
     </div>
 
     <!-- 签收信息 -->
-
-    <el-collapse class="el_commodity" v-model="activeNames" style="margin-top: 10px">
+    <el-button style="margin-top:10px" type="primary" icon="Position" @click="Signforexport">导出</el-button>
+    <el-collapse class="el_commodity" v-model="activeNames" >
       <el-collapse-item title="商品信息" name="1">
         <el-tabs
           v-loading="editLoading"
@@ -379,7 +379,7 @@
           type="border-card"
           @tab-click="tabClick"
         >
-          <el-button style=" margin-bottom: 10px;" type="primary" icon="Position" @click="Signforexport">导出</el-button>
+       
           <template v-for="item in Tabs" :key="item.name">
             <el-tab-pane :label="item.label" :name="item.name">
               <template v-if="item.type === 'package'">

src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue

@@ -323,6 +323,7 @@
         v-model="box"
         width="50%"
         :before-close="beforeClose"
+        :show-close='false'
         append-to-body
       >
         <el-form
@@ -459,7 +460,7 @@ import { getListMaterial } from '@/api/basic/basicMaterial';
 import { getDetailWarehouse, getListCopy } from '@/api/basicdata/basicdataWarehouse';
 import { getListIdsName } from '@/api/basicdata/basicdataStoreBrand';
 import { getListName } from '@/api/basicdata/basicdataStoreBusiness';
-
+import { ElMessage, ElMessageBox } from 'element-plus'
 export default {
   name: 'warehouseWarehouseingAddReceipt',
   data() {
@@ -941,7 +942,17 @@ export default {
     handleDetail() {
       this.$refs.formDetail.validate(valid => {
         if (valid) {
-          console.log(this.formDetail);
+    ElMessageBox.confirm(
+    `是否确认入库${this.formDetail.createInventory}件`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+      console.log(this.formDetail);
           this.stuff.some(i => {
             console.log(i);
             if (i.id == this.formDetail.productName) {
@@ -986,6 +997,12 @@ export default {
           }
           this.box = false;
           this.formDetail = {};
+    })
+    .catch(() => {
+      this.formDetail.createInventory=0
+    })
+
+         
         }
       });
     },
@@ -1206,8 +1223,8 @@ export default {
         });
     },
     beforeClose(done) {
-      done();
-      this.view = false;
+      // done();
+      // this.view = false;
     },
     selectionChange(list) {
       this.selectionList = list;