From d8c3a0616b698c9f85c713ee53b2c80ee5a3902e Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 14 Mar 2024 16:32:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=BA=93=E8=AE=A2=E5=8D=95=E6=92=A4?=
 =?UTF-8?q?=E9=94=80=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=8A=A5=E8=A1=A8=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BB=93=E5=BA=93=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/distribution/distributionStockList.js |   8 ++
 .../warehouse/basicdataWarehouse.vue          |  12 +-
 .../distributionStockListDetails.vue          | 105 ++++++++++++------
 src/views/reportforms/DeliveryTrainNumber.vue |  23 ++--
 vite.config.js                                |   2 +-
 5 files changed, 101 insertions(+), 49 deletions(-)

diff --git a/src/api/distribution/distributionStockList.js b/src/api/distribution/distributionStockList.js
index 11e191da..8c215744 100644
--- a/src/api/distribution/distributionStockList.js
+++ b/src/api/distribution/distributionStockList.js
@@ -223,3 +223,11 @@ export const getPackage = (id) => {
   })
 }
 
+// 撤销
+export const $_cancelAddStockListByPackage = (row) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockList/cancelAddStockListByPackage',
+    method: 'post',
+    data: row
+  })
+}
\ No newline at end of file
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index a4d5db04..808f27b2 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -1024,13 +1024,16 @@ export default {
             this.form.address = a;
           }
           const data = res.data.data;
-          //日期回显
+          if(data){
+                      //日期回显
           if (!!data.startDate && !!data.endDate) {
             this.form.daterange.push(res.data.data.startDate, res.data.data.endDate);
           }
           if (!!data.administrativeAreas) {
-            data.administrativeAreas = data.administrativeAreas.split(',');
+             data.administrativeAreas = data.administrativeAreas.split(',');
           }
+          }
+
           this.form = res.data.data;
         });
       }
@@ -1135,8 +1138,11 @@ export default {
         //这里对管理区域进行数据拼接进行回显
         data.records.forEach(item => {
           let b = [];
-          item.administrativeAreas = item.administrativeAreas.split(',');
+          if(item.administrativeAreas){
+            item.administrativeAreas = item.administrativeAreas.split(',');   
           console.log('=============>', item.administrativeAreas);
+          }
+    
           if (item.provinceCode) {
             b.push(item.provinceCode);
           }
diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue
index b4b06bad..59742423 100644
--- a/src/views/distribution/inventory/distributionStockListDetails.vue
+++ b/src/views/distribution/inventory/distributionStockListDetails.vue
@@ -31,13 +31,13 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="货物单位:">
-              <span>{{ queryOwn.cargoUnit || '无'}}</span>
+              <span>{{ queryOwn.cargoUnit || '无' }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="10">
             <el-form-item label="门店地址:">
               <!-- <span>{{ queryOwn?:!queryOwn.storeName ? !queryOwn:  '无' :    queryOwn.storeName }}</span> -->
-              <span>{{  queryOwn.storeNam||'无'}}</span>
+              <span>{{ queryOwn.storeNam || '无' }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -144,7 +144,18 @@
               @selection="selectionChange"
             >
               <template #default="slotProps">
-                <el-text v-if="slotProps.scope.row.sourceType === '1'" size="small" @click="handleInventoryQRCode(slotProps.scope)">查看二维码</el-text>
+                <el-text
+                  v-if="slotProps.scope.row.sourceType === '1'"
+                  size="small"
+                  @click="revokeFn(slotProps.scope.row)"
+                  >撤销</el-text
+                >
+                <el-text
+                  v-if="slotProps.scope.row.sourceType === '1'"
+                  size="small"
+                  @click="handleInventoryQRCode(slotProps.scope)"
+                  >查看二维码</el-text
+                >
               </template>
             </tablecmt>
             <div class="avue-crud__pagination" style="width: 100%">
@@ -216,48 +227,44 @@
         </div>
       </el-row>-->
     </div>
-    <el-dialog
-            title="二维码"
-            :visible.sync="dialogVisibleF"
-            width="780px"
-            v-model="dialogVisibleF"
-    >
+    <el-dialog title="二维码" :visible.sync="dialogVisibleF" width="780px" v-model="dialogVisibleF">
       <div>
         <div v-html="html"></div>
       </div>
       <span slot="footer" class="dialog-footer">
-          <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-          <el-button type="primary" @click="printTemplate">打 印</el-button>
-          <el-button @click="dialogVisibleF = false">取 消</el-button>
-        </span>
+        <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+        <el-button type="primary" @click="printTemplate">打 印</el-button>
+        <el-button @click="dialogVisibleF = false">取 消</el-button>
+      </span>
     </el-dialog>
-
-
   </basic-container>
 </template>
 
 <script>
-  import {
-    getList,
-    getDetail,
-    add,
-    update,
-    remove,
-    getListAllocation,
-    stockExport,
-    stockInfoExport, showInventoryPackgeCode, showInventorySourcePackageCode
-  } from '@/api/distribution/distributionStockList';
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  getListAllocation,
+  stockExport,
+  stockInfoExport,
+  showInventoryPackgeCode,
+  showInventorySourcePackageCode,
+  $_cancelAddStockListByPackage,
+} from '@/api/distribution/distributionStockList';
 import option from '@/option/distribution/distributionStockList';
 import { mapGetters } from 'vuex';
 import { getListStock } from '@/api/distribution/distributionStock';
 import { getStockListInfoList } from '@/api/distribution/distributionStockListInfo';
 import { downloadXls } from '@/utils/util';
-
+import { ElMessage, ElMessageBox } from 'element-plus';
 export default {
   data() {
     return {
-      dialogVisibleF:false,
-      html:'',
+      dialogVisibleF: false,
+      html: '',
       columnListarrs: {
         //入库明细
         columnWarehousing: [
@@ -637,23 +644,49 @@ export default {
   },
   methods: {
     //查看二维码
-    handleInventoryQRCode(scope){
+    handleInventoryQRCode(scope) {
       const { row } = scope;
-      console.log('执行查看二维码------------>row:',row);
+      console.log('执行查看二维码------------>row:', row);
 
       this.materialQRCode = row;
-      console.log('---------------->',row);
+      console.log('---------------->', row);
       let qr = {
         ids: row.id,
       };
       this.html = '';
-      showInventorySourcePackageCode(row.incomingBatch,row.parcelListId).then(res => {
+      showInventorySourcePackageCode(row.incomingBatch, row.parcelListId).then(res => {
         // this.orderPackageCode = res.data
         console.log(res.data);
         this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
       });
       this.dialogVisibleF = true;
     },
+    revokeFn(val) {
+      ElMessageBox.confirm('撤销物料会产生库存数量扣减，是否继续?', 'Warning', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.loading = true;
+          let data = {
+            stockListId: val.stockListId,
+            packageIds: val.parcelListId,
+            stockListInfoIds: val.id,
+          };
+          console.log(data, '提交参数');
+          $_cancelAddStockListByPackage(data).then(res => {
+            if (res.data.code == 200) {
+              ElMessage({
+                type: 'success',
+                message: res.data.msg,
+              });
+              this.getOnRu(this.page2);
+            }
+          });
+        })
+        .catch(() => {});
+    },
     //导出
     handleExport() {
       let row = {};
@@ -868,7 +901,7 @@ export default {
           i.outboundTypeName = '自提';
         }
       });
-      console.log("处理的数据》》》",this.data1);
+      console.log('处理的数据》》》', this.data1);
       this.page1.total = b.data.data.total;
       this.loading = false;
     },
@@ -880,8 +913,8 @@ export default {
       this.query.materialId = this.queryOwn.materialId;
       this.query.warehouseId = this.queryOwn.warehouseId;
       this.query.incomingBatch = this.$route.query.incomingBatch;
-      this.query.stockListId=this.$route.query.id;
-      console.log(this.query.stockListId,'this.query.stockListId');
+      this.query.stockListId = this.$route.query.id;
+      console.log(this.query.stockListId, 'this.query.stockListId');
       this.query.storeId =
         !!this.queryOwn.storeId && this.queryOwn.storeId != '-1' ? this.queryOwn.storeId : null;
       if (!!this.queryOwn.pid) {
@@ -933,7 +966,7 @@ export default {
       let a = await getList(page.currentPage, page.pageSize, Object.assign(params, this.query));
       console.log('aaaa', a.data.data.records);
       this.queryOwn = a.data.data.records[0] || {};
-      console.log(this.queryOwn ,'参数');
+      console.log(this.queryOwn, '参数');
       if (!this.queryOwn.pid) {
         console.log('11111111111');
         //查全部
diff --git a/src/views/reportforms/DeliveryTrainNumber.vue b/src/views/reportforms/DeliveryTrainNumber.vue
index fd405aec..9807ea2c 100644
--- a/src/views/reportforms/DeliveryTrainNumber.vue
+++ b/src/views/reportforms/DeliveryTrainNumber.vue
@@ -25,7 +25,7 @@
             <el-form-item label="仓库">
               <el-select
                 multiple
-                v-model="TopQuery.warehouse"
+                v-model="TopQuery.warehouseNameRange"
                 filterable
                 placeholder="多选仓库搜索"
                 style="width: 240px"
@@ -167,6 +167,7 @@ import { ElMessageBox } from 'element-plus';
 import { downloadXls } from '@/utils/util';
 import functions from '@/utils/functions.js';
 const warehouseList = ref([]); //仓库列表
+const queryCarn=ref({});//查询顶部
 const DeliveryTypeList = ref([
   {
     label: '商配',
@@ -344,20 +345,23 @@ const selectionChange = list => {
 const searchChange = () => {
   // 日期处理
   if (TopQuery.value.time) {
-    TopQuery.value.ks = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD'); //开始日期
-    TopQuery.value.end = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD'); //结束日期
+    queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
+    queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   }
   // 仓库处理
-  if (TopQuery.value.warehouse) {
-    TopQuery.value.warehouseJoin = TopQuery.value.warehouse.join(',');
+  if (TopQuery.value.warehouseNameRange.length) {
+    queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
+  }else{
+    delete queryCarn.value.warehouseNameRange;                                          
   }
-  console.log(TopQuery.value, '顶部搜索触发');
+  console.log(queryCarn.value, '顶部搜索触发');
+  getrain(queryCarn.value)
   // details.search = false; //关闭搜索
 };
 const Toptiem = val => {
   if (!val) {
-    delete TopQuery.value.ks;
-    delete TopQuery.value.end;
+    delete TopQuery.value.startTaskTime;
+    delete TopQuery.value.endTaskTime;
   }
   console.log(val, '顶部时间触发');
   console.log(TopQuery.value, '顶部时间触发');
@@ -427,11 +431,12 @@ const onLoad = () => {
 };
 onLoad();
 // 获取数据
-const getrain = () => {
+const getrain = (val) => {
   let data = {
     current: details.page.currentPage,
     size: details.page.pageSize,
     ...details.query,
+    ...val,
   };
   details.loadingObj.list = true;
   $_getrain(data)
diff --git a/vite.config.js b/vite.config.js
index 90a4ce96..85e2a6c9 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -16,7 +16,7 @@ export default ({ mode, command }) => {
           // hy
           // target: 'http://192.168.3.12:13000',
           // cg 
-          // target: 'http://192.168.3.18:13000',   
+          // target: 'http://192.168.3.18:13000',     
           // lmy
           // target: 'http://192.168.10.123:8889',
           // target: 'http://192.168.10.101:8888',