仓储删除提示修改

src/api/warehouseBusiness/goodsTransfer.js

@@ -104,3 +104,10 @@ export function backFee(fId) {
     method: 'get',
   })
 }
+//删除前的判断
+export function delgoodsTransfer_s(fId) {
+  return request({
+    url: '/warehouseBusiness/goodsTransfer/queryRemove/' + fId,
+    method: 'delete'
+  })
+}

src/api/warehouseBusiness/stockTransfer.js

@@ -129,3 +129,10 @@ export function serialNumber() {
     method: 'post',
   })
 }
+//删除前的判断
+export function delstockTransfer_s(fId) {
+  return request({
+    url: '/warehouseBusiness/stockTransfer/queryRemove/' + fId,
+    method: 'delete'
+  })
+}

src/api/warehouseBusiness/storageFeeCalculation.js

@@ -93,3 +93,10 @@ export function backFee(fId) {
     method: 'get',
   })
 }
+//删除前的判断
+export function delstorageFeeCalculation_s(fId) {
+  return request({
+    url: '/warehouseBusiness/storageFeeCalculation/queryRemove/' + fId,
+    method: 'delete'
+  })
+}

src/api/warehouseBusiness/warehouseInStock.js

@@ -116,3 +116,10 @@ export function serialNumber() {
     method: 'post',
   })
 }
+//删除前的判断
+export function delinStock_s(fId) {
+  return request({
+    url: '/warehouseBusiness/inStock/queryRemove/' + fId,
+    method: 'delete'
+  })
+}

src/api/warehouseBusiness/warehouseOutStock.js

@@ -117,3 +117,10 @@ export function serialNumber() {
     method: 'post',
   })
 }
+//删除前的判断
+export function delOutStock_s(fId) {
+  return request({
+    url: '/warehouseBusiness/outStock/queryRemove/' + fId,
+    method: 'delete'
+  })
+}

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -1807,6 +1807,7 @@
     addGoodsTransfer,
     warehouseSubmission,
     delGoodsTransfer,
+    delgoodsTransfer_s,
     exportGoodsTransfer
   } from '@/api/warehouseBusiness/goodsTransfer'
   import { updateCredit } from '@/api/warehouseBusiness/goodsTransfer'
@@ -1837,6 +1838,7 @@
   import { addSet, select } from '@/api/system/set'
   import draggable from "vuedraggable";
   import Vue from 'vue'
+
   Vue.directive('dialogDrag', {
     bind(el, binding, vnode, oldVnode) {
       const dialogHeaderEl = el.querySelector('.el-dialog__header')
@@ -3513,8 +3515,32 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const fIds = row.fId || this.ids
+        let tips = ''
+        delgoodsTransfer_s(fIds).then( data =>{
+          switch (data.msg) {
+            case '0': {
+              this.$message.error('当前数据已被其他操作员操作请刷新页面')
+              break
+            }
+            case '1': {
+              tips = '当前主表有数据从表无数据是否删除'
+              this.delete_S(fIds, tips)
+              break
+            }
+            case '2': {
+              tips = '当前主表有数据从表有数据是否删除'
+              this.delete_S(fIds, tips)
+              break
+            }
+            default:{
+              return this.$message.error('未知错误，无状态')
+            }
+          }
+        })
+      },
+      delete_S(fIds,tips){
         this.$confirm(
-          '是否确认删除仓库主(出入库)编号为"' + fIds + '"的数据项?',
+          tips,
           '警告',
           {
             confirmButtonText: '确定',

src/views/warehouseBusiness/inStock/index.vue

@@ -3021,6 +3021,7 @@ import {
   exportWarehousebills,
   revoke,
   revokeTwo,
+  delinStock_s,
   serialNumber
 } from "@/api/warehouseBusiness/warehouseInStock";
 import { operationAgreement } from "@/api/agreement/agreement";
@@ -3039,6 +3040,7 @@ import Cookies from 'js-cookie'
 import { addSet, select } from '@/api/system/set'
 import draggable from "vuedraggable";
 import Vue from 'vue'
+import { delCharge } from '@/api/finance/payment'
 
 Vue.directive('dialogDrag', {
   bind(el, binding, vnode, oldVnode) {
@@ -5816,22 +5818,40 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const fIds = row.fId || this.ids
-      this.$confirm(
-        '是否确认删除仓库主(出入库)编号为"' + fIds + '"的数据项?',
-        '警告',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
+      let tips = ''
+      delinStock_s(fIds).then( data =>{
+        switch (data.msg) {
+          case '0': {
+            this.$message.error('当前数据已被其他操作员操作请刷新页面')
+            break
+          }
+          case '1': {
+            tips = '当前主表有数据从表无数据是否删除'
+            this.delete_S(fIds, tips)
+            break
+          }
+          case '2': {
+            tips = '当前主表有数据从表有数据是否删除'
+            this.delete_S(fIds, tips)
+            break
+          }
+          default:{
+            return this.$message.error('未知错误，无状态')
+          }
         }
-      )
-        .then(function() {
-          return delWarehousebills(fIds)
-        })
-        .then(() => {
-          this.getList()
-          this.msgSuccess('删除成功')
-        })
+      })
+    },
+    delete_S(fIds, tips) {
+      this.$confirm(tips, '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return delWarehousebills(fIds)
+      }).then(() => {
+        this.getList()
+        this.msgSuccess('删除成功')
+      })
     },
     /** 导出按钮操作 */
     handleExport() {

src/views/warehouseBusiness/outStock/index.vue

@@ -2904,6 +2904,7 @@ import {
   exportWarehousebills,
   revokeTwo,
   revoke,
+  delOutStock_s,
   serialNumber
 } from "@/api/warehouseBusiness/warehouseOutStock";
 
@@ -5593,8 +5594,31 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const fIds = row.fId || this.ids.fId;
-      this.$confirm(
-        '是否确认删除仓库主(出入库)编号为"' + fIds + '"的数据项?',
+      let tips = ''
+      delOutStock_s(fIds).then( data =>{
+        switch (data.msg) {
+          case '0': {
+            this.$message.error('当前数据已被其他操作员操作请刷新页面')
+            break
+          }
+          case '1': {
+            tips = '当前主表有数据从表无数据是否删除'
+            this.delete_S(fIds, tips)
+            break
+          }
+          case '2': {
+            tips = '当前主表有数据从表有数据是否删除'
+            this.delete_S(fIds, tips)
+            break
+          }
+          default:{
+            return this.$message.error('未知错误，无状态')
+          }
+        }
+      })
+    },
+    delete_S(fIds, tips){
+      this.$confirm(tips,
         "警告",
         {
           confirmButtonText: "确定",

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -434,7 +434,7 @@
             <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px"></span>
             </span>
           <div class="avue-crud__dialog__menu enlarge" @click="full">
-            <i class="el-icon-full-screen"></i>
+            <i  style="cursor: pointer;display: block;width:12px;height:12px;border:1px solid #909399;border-top:3px solid #909399;margin-top: -3px;"></i>
           </div>
         </div>
       </template>
@@ -2774,6 +2774,7 @@ import {
   warehouseSubmission,
   updateStockTransfer,
   exportStockTransfer,
+  delstockTransfer_s,
   serialNumber
 } from "@/api/warehouseBusiness/stockTransfer";
 
@@ -4200,9 +4201,9 @@ export default {
         // } else if (!this.printinglist[warehouseCr].fDriverIdCar) {
         //   this.$message.error('请选填写司机身份证')
         //   return false
-        // } else if (!this.printinglist[warehouseCr].fDriverName) {
-        //   this.$message.error('请输入司机姓名')
-        //   return false
+        } else if (!this.printinglist[warehouseCr].fTransferWarehouselocid) {
+          this.$message.error('请输入调入库位')
+          return false
         }
         for (let opt in this.fStorageTypeOptions) {
           if (this.fStorageTypeOptions[opt].dictValue === this.printinglist[warehouseCr].fBusinessType) {
@@ -5538,8 +5539,32 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const fIds = row.fId || this.ids.fId;
+      let tips = ''
+      delstockTransfer_s(fIds).then( data =>{
+        switch (data.msg) {
+          case '0': {
+            this.$message.error('当前数据已被其他操作员操作请刷新页面')
+            break
+          }
+          case '1': {
+            tips = '当前主表有数据从表无数据是否删除'
+            this.delete_S(fIds, tips)
+            break
+          }
+          case '2': {
+            tips = '当前主表有数据从表有数据是否删除'
+            this.delete_S(fIds, tips)
+            break
+          }
+          default:{
+            return this.$message.error('未知错误，无状态')
+          }
+        }
+      })
+    },
+    delete_S(fIds, tips){
       this.$confirm(
-        '是否确认删除仓库主(出入库)编号为"' + fIds + '"的数据项?',
+        tips,
         "警告",
         {
           confirmButtonText: "确定",

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -927,6 +927,7 @@
     updateStorageFeeCalculation,
     exportStorageFeeCalculation,
     exportWarehousebillsitems,
+    delstorageFeeCalculation_s
   } from "@/api/warehouseBusiness/storageFeeCalculation";
   import { listUser, queryUserVal } from "@/api/system/user";
   import { listGoods } from "@/api/basicdata/goods";
@@ -1610,8 +1611,32 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const fIds = row.fId || this.ids.fId;
+        let tips = ''
+        delstorageFeeCalculation_s(fIds).then( data =>{
+          switch (data.msg) {
+            case '0': {
+              this.$message.error('当前数据已被其他操作员操作请刷新页面')
+              break
+            }
+            case '1': {
+              tips = '当前主表有数据从表无数据是否删除'
+              this.delete_S(fIds, tips)
+              break
+            }
+            case '2': {
+              tips = '当前主表有数据从表有数据是否删除'
+              this.delete_S(fIds, tips)
+              break
+            }
+            default:{
+              return this.$message.error('未知错误，无状态')
+            }
+          }
+        })
+      },
+      delete_s(fIds,tips){
         this.$confirm(
-          '是否确认删除仓库主(出入库)编号为"' + fIds + '"的数据项?',
+          tips,
           "警告",
           {
             confirmButtonText: "确定",