前端gjy

src/api/V2/contract/index.js

@@ -19,11 +19,10 @@ export const API_GET_BILL_OPERATE_HIS = '/billOperateHis/query/commonBillOperate
 // 修改状态
 export const API_POST_EDITSTATUS = '/contractManagementInfo/editStatus'
 //删除销售合同
-export const API_POST_CONTRACT_DELETE ='/contractManagementInfo/deleteInfo '
+export const API_POST_CONTRACT_DELETE = '/contractManagementInfo/deleteInfo '
 //销售合同修改编辑 
 
-export const API_POST_EDITINFO ='/contractManagementInfo/editInfo'
-
-
-                                         
+export const API_POST_EDITINFO = '/contractManagementInfo/editInfo'
+// 获取负责人
+export const API_GET_STAFF = '/staff/query/getStaffListByCompId'
 

src/api/V2/transport/index.js

@@ -24,3 +24,5 @@ export const API_POST_EDIT_DRIVER = '/driverViewInfo/api/editInfo'
 export const API_GET_PRAAMETER = '/commonSysParameter/getInfo'
 //运输任务查看
 export const API_POST_TRAN_LOOK = '/tranTaskInfo/getTranTask'
+// 汽运调度列表
+export const API_GET_AUTOMOBILE_TRAN_LIST = '/tranProcessInfo/selectTranProcessInfo'

src/model/contarct/index.js

@@ -15,7 +15,7 @@ import {
     API_GET_CONTRACT_MANAGEMENTINFO,
     API_POST_EDITINFO,
     API_POST_CONTRACT_DELETE,
-    API_POST_CLEARANCE,
+    API_GET_STAFF
 } from '@/api/V2/contract'
 // 列表
 export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
@@ -37,9 +37,11 @@ export const billoperatehis = appRx.get(API_GET_BILL_OPERATE_HIS, errorCatcher,
 // 修改状态
 export const editstatus = appRx.post(API_POST_EDITSTATUS, errorCatcher, errorHandle, filter)
 //删除销售合同
-export const deletecontract = appRx.post(API_POST_CONTRACT_DELETE,errorCatcher,errorHandle,filter) 
+export const deletecontract = appRx.post(API_POST_CONTRACT_DELETE, errorCatcher, errorHandle, filter)
 //修改销售合同编辑
 export const editInfo = appRx.post(API_POST_EDITINFO, errorCatcher, errorHandle, filter)
+//获取负责人
+export const getstaff = appRx.get(API_GET_STAFF, errorCatcher, errorHandle, filter)
 
 
 

src/model/transport/index.js

@@ -16,6 +16,7 @@ import {
     API_POST_EDIT_DRIVER,
     API_GET_PRAAMETER,
     API_POST_TRAN_LOOK,
+    API_GET_AUTOMOBILE_TRAN_LIST
 } from '@/api/V2/transport'
 // 司机列表
 export const selectDriver = appRx.get(API_GET_TRAN_DRIVERINFO, errorCatcher, errorHandle, filter)
@@ -44,4 +45,6 @@ export const editdriver = appRx.post(API_POST_EDIT_DRIVER, errorCatcher, errorHa
 // 司机管理-车头、车型
 export const packList = appRx.get(API_GET_PRAAMETER, errorCatcher, errorHandle, filter)
 //运输任务查看
-export const lookTranTask = appRx.get(API_POST_TRAN_LOOK, errorCatcher, errorHandle, filter)
+export const lookTranTask = appRx.get(API_POST_TRAN_LOOK, errorCatcher, errorHandle, filter)
+//汽运调度列表
+export const automobileList = appRx.get(API_GET_AUTOMOBILE_TRAN_LIST, errorCatcher, errorHandle, filter)

src/views/contractManagement/purchaseContract.vue

@@ -4,12 +4,7 @@
   <div>
     <BaseHeaderLayout :leftSpan="10">
       <template slot="left">
-        <ws-button
-          type="primary"
-          @click="handleAdd()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
+        <ws-button type="primary" @click="handleAdd()"
           ><img
             width="13"
             height="13"

src/views/contractManagement/purchaseContractAdd.vue

@@ -321,20 +321,20 @@
           span="1"
           prop="packingMethod"
         >
-          <ws-select
-            v-model="deptBudgetList.packingMethod"
+          <el-select
+            v-model="deptBudgetList.personCharge"
             placeholder="请选择临时库负责人"
-            class="typeselect"
-            :value="value1"
-            @change="selectpackingMethod"
+            filterable
+            :filter-method="dataFilter"
+            @change="selectstaff"
           >
-            <ws-option
-              v-for="item in packtypeList"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.staffName"
+              :value="item.staffName"
             />
-          </ws-select>
+          </el-select>
         </ws-form-item>
       </ws-info-table>
       <div class="wenzi">
@@ -554,6 +554,7 @@ import {
   addxiala,
   editxiala,
   delxiala,
+  getstaff,
 } from '@/model/contarct/index'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import { dayjs, fmoney, EventBus } from 'base-core-lib'
@@ -600,6 +601,8 @@ export default {
         //   { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' },
         // ],
       },
+      options: [],
+      staffList: [],
       appendixIdsAdd: '',
       size: 10,
       // uploadSuccess: {},
@@ -661,10 +664,42 @@ export default {
     this.deptBudgetList.contractProcessInfo.gradeKey = 1
     this.deptBudgetList.contractGoodsInfo.grade = '一等品'
     this.deptBudgetList.contractGoodsInfo.gradeKey = 1
+    console.log(1111)
+    getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+      .toPromise()
+      .then((response) => {
+        this.options = response
+        this.staffList = response
+      })
     this.loaddata()
     this.showType = this.isShow
   },
   methods: {
+    dataFilter(val) {
+      this.deptBudgetList.personCharge = val
+      if (val) {
+        //val存在
+        this.options = this.staffList.filter((item) => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.options = this.staffList
+      }
+    },
+    selectstaff(e) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == e) {
+          this.deptBudgetList.personPhone = this.staffList[i].staffMobilePhone
+          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
+        }
+      }
+    },
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleClose() {
       this.dialogViewSpareMoney = false

src/views/contractManagement/purchaseContractEdit.vue

@@ -62,7 +62,6 @@
         </ws-form-item>
         <!-- 交货方式 -->
         <ws-form-item label="结算方式" span="1" prop="settlementMethod">
-          
           <ws-input
             v-model="deptBudgetList.settlementMethod"
             maxlength="100"
@@ -312,19 +311,20 @@
           prop="packingMethod"
           v-show="deptBudgetList.deliverType == 1"
         >
-          <ws-select
-            v-model="deptBudgetList.packingMethod"
-            placeholder=""
-            class="typeselect"
-            @change="selectpackingMethod"
+          <el-select
+            v-model="deptBudgetList.personCharge"
+            placeholder="请选择临时库负责人"
+            filterable
+            :filter-method="dataFilter"
+            @change="selectstaff"
           >
-            <ws-option
-              v-for="item in packtypeList"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.staffName"
+              :value="item.staffName"
             />
-          </ws-select>
+          </el-select>
         </ws-form-item>
       </ws-info-table>
       <base-card>
@@ -528,6 +528,7 @@ import {
   delxiala,
   examineList,
   editInfo,
+  getstaff,
 } from '@/model/contarct/index'
 import WsUpload from '@/components/WsUpload'
 import { EventBus, dayjs } from 'base-core-lib'
@@ -572,6 +573,8 @@ export default {
       mainReportAdd: {},
       list: {},
       unitList: [],
+      options: [],
+      staffList: [],
       packtypeList: [],
       goodnameList: [],
       gradeList: [],
@@ -588,10 +591,41 @@ export default {
   },
 
   activated() {
+    getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+      .toPromise()
+      .then((response) => {
+        this.options = response
+        this.staffList = response
+      })
     this.loaddata()
     this.showType = this.isShow
   },
   methods: {
+    dataFilter(val) {
+      this.deptBudgetList.personCharge = val
+      if (val) {
+        //val存在
+        this.options = this.staffList.filter((item) => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.options = this.staffList
+      }
+    },
+    selectstaff(e) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == e) {
+          this.deptBudgetList.personPhone = this.staffList[i].staffMobilePhone
+          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
+        }
+      }
+    },
     handleChange(value) {
       this.selectedOptions = value
     },
@@ -603,7 +637,6 @@ export default {
       examineList({ id: this.$route.query.id })
         .toPromise()
         .then((response) => {
-         
           if (response.weight) {
             response.weight = String(response.weight)
           }
@@ -634,10 +667,10 @@ export default {
             ].code
           this.selectedOptions1 = tmp1
           this.deptBudgetList = response
-          if(this.deptBudgetList.deliverType == 1){
-            this.deptBudgetList.deliverType1 = "我方自提"
-          }else if(this.deptBudgetList.deliverType == 2){
-            this.deptBudgetList.deliverType1 = "对方送货" 
+          if (this.deptBudgetList.deliverType == 1) {
+            this.deptBudgetList.deliverType1 = '我方自提'
+          } else if (this.deptBudgetList.deliverType == 2) {
+            this.deptBudgetList.deliverType1 = '对方送货'
           }
         })
       // 包装方式
@@ -645,7 +678,6 @@ export default {
         .toPromise()
         .then((response) => {
           this.packtypeList = response
-          
         })
       // 验收方式
       this.getUnitList()
@@ -702,7 +734,6 @@ export default {
       })
         .toPromise()
         .then((response) => {
-           
           this.unitList = response
           let currItem
           this.unitList.forEach((item, index, arr) => {
@@ -715,7 +746,6 @@ export default {
           if (currItem) {
             this.selectContract(currItem.constValue)
           }
-          
         })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
@@ -1266,7 +1296,8 @@ export default {
       }
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
-          this.deptBudgetList.sourceProvince = CodeToText[this.selectedOptions[0]]
+          this.deptBudgetList.sourceProvince =
+            CodeToText[this.selectedOptions[0]]
           this.deptBudgetList.sourceCity = CodeToText[this.selectedOptions[1]]
           this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
           this.deptBudgetList.deliveryProvince =

src/views/tranManagement/component/routers/route.js

@@ -13,21 +13,21 @@ const tranManagementRouter = {
   },
   children: [
     //运输任务
-    {
-      path: 'tranManagementTransport',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransport'),
-      name: 'tranManagementTransport',
-      meta: {
-        title: 'tranManagementTransport',
-        shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementTransport',
-        permissicon: [],
-        keepAlive: true
-      },
+    // {
+    //   path: 'tranManagementTransport',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransport'),
+    //   name: 'tranManagementTransport',
+    //   meta: {
+    //     title: 'tranManagementTransport',
+    //     shortcutEntrance: 'tranManagement',
+    //     module: 'tranManagement.tranManagementDriver.tranManagementTransport',
+    //     permissicon: [],
+    //     keepAlive: true
+    //   },
 
-      // hidden: true
-    },
+    //   // hidden: true
+    // },
     //火运调度
     {
       path: 'tranManagementTransporTationFire',

src/views/tranManagement/tranManagementVehicle.vue

@@ -4,17 +4,17 @@
     <BaseHeaderLayout :leftSpan="20">
       <template slot="left">
         <ws-button
-        class="but"
+          class="but"
           type="primary"
           @click="handleAdd()"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
           "
-          >
+        >
           执行中</ws-button
         >
         <ws-button
-        class="but"
+          class="but"
           @click="handleLook()"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
@@ -22,29 +22,29 @@
           >已完成</ws-button
         >
         <ws-button
-        class="but"
+          class="but"
           @click="handleEdit()"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
           "
           >全部任务</ws-button
-        > 
+        >
       </template>
       <!-- 接单开始 -->
       <template slot="left">
-            <ws-date-picker
-              v-model="deptBudgetList.inOutDate"
-              type="date"
-              placeholder="请选择开始日期"
-              value-format="yyyy-MM-dd"
-            />
-            <span>至</span>
-            <ws-date-picker
-              v-model="deptBudgetList.inOutDate"
-              type="date"
-              placeholder="请选择结束日期"
-              value-format="yyyy-MM-dd"
-            />
+        <ws-date-picker
+          v-model="deptBudgetList.inOutDate"
+          type="date"
+          placeholder="请选择开始日期"
+          value-format="yyyy-MM-dd"
+        />
+        <span>至</span>
+        <ws-date-picker
+          v-model="deptBudgetList.inOutDate"
+          type="date"
+          placeholder="请选择结束日期"
+          value-format="yyyy-MM-dd"
+        />
         <ws-input
           v-model="searchKeyWord"
           placeholder="可按照合同编号、买方名称、卖方名称进行查找"
@@ -146,61 +146,58 @@
           </template>
         </el-table-column>
 
-      <el-table-column prop="status" label="状态">
-        <template slot-scope="scope">
-          <el-popover
-          placement="left"
-          :width="285"
-          trigger="click"
-          visible-arrow="false"
-          @show="history(scope.row)"
-          >
-          <template>
-            <span slot="reference">
-              <span
-              v-if="scope.row.status =='待执行'"
-              class="executory"
-              ></span>
-            <span
-            v-if="scope.row.status == '执行中'"
-            class="inExecution"
-            ></span>
-            <span v-if="scope.row.status == '已完成'" class="done"></span
-            >{{scope.row.status}}
-            </span>
-          </template>
-          <div>
-              <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
-              <div v-for="(item, index) in historyList" class="flex">
-                <div class="vertical-text vertical-text-left">
-                  {{ item.updateDate }}
-                </div>
-                <div>
-                  <div class="vertical-circle"></div>
-                  <div
-                    v-if="index != historyList.length - 1"
-                    class="vertical-line"
-                  ></div>
-                </div>
-                <div class="vertical-text">
-                  {{ item.operateUser }}<br />{{ item.dealMsg }}
+        <el-table-column prop="status" label="状态">
+          <template slot-scope="scope">
+            <el-popover
+              placement="left"
+              :width="285"
+              trigger="click"
+              visible-arrow="false"
+              @show="history(scope.row)"
+            >
+              <template>
+                <span slot="reference">
+                  <span
+                    v-if="scope.row.status == '待执行'"
+                    class="executory"
+                  ></span>
+                  <span
+                    v-if="scope.row.status == '执行中'"
+                    class="inExecution"
+                  ></span>
+                  <span v-if="scope.row.status == '已完成'" class="done"></span
+                  >{{ scope.row.status }}
+                </span>
+              </template>
+              <div>
+                <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
+                <div v-for="(item, index) in historyList" class="flex">
+                  <div class="vertical-text vertical-text-left">
+                    {{ item.updateDate }}
+                  </div>
+                  <div>
+                    <div class="vertical-circle"></div>
+                    <div
+                      v-if="index != historyList.length - 1"
+                      class="vertical-line"
+                    ></div>
+                  </div>
+                  <div class="vertical-text">
+                    {{ item.operateUser }}<br />{{ item.dealMsg }}
+                  </div>
                 </div>
               </div>
-            </div>
-          </el-popover>
-          <img
-            width="17"
-            height="18"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/edit.png"
-            @click="editClick(scope.row)"
-            alt=""
-          />
-          
-        </template>
-        
-
-      </el-table-column>
+            </el-popover>
+            <img
+              width="17"
+              height="18"
+              style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png"
+              @click="editClick(scope.row)"
+              alt=""
+            />
+          </template>
+        </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
             <ws-button
@@ -234,12 +231,7 @@
   </div>
 </template>
 <script>
-import {
-  getList,
-  export1,
-  editstatus,
-  billoperatehis,
-} from '@/model/warehouse/index'
+import { automobileList } from '@/model/transport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -330,7 +322,7 @@ export default {
           positionId: item.binNumberId,
           warehouseName: item.warehouseName,
           binNumber: item.binNumber,
-          capacity:item.capacity - free ,
+          capacity: item.capacity - free,
         },
       })
     },
@@ -418,8 +410,8 @@ export default {
       this.$router.push({ path: 'tranManagementTransportEdit' })
     },
     // 派车
-    warehousing(){
-        this.$router.push({ path: 'tranManagementVehicleDispatching'})
+    warehousing() {
+      this.$router.push({ path: 'tranManagementVehicleDispatching' })
     },
     dateFormat(fmt, date) {
       let ret
@@ -457,9 +449,10 @@ export default {
       this.getList()
     },
     getList() {
-      getList({
+      automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        warehouseName: this.warehouseName,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
       })
         .toPromise()
         .then((response) => {
@@ -629,20 +622,20 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
-.el-row{
-    height: 150px;
+.el-row {
+  height: 150px;
 }
-.base_header_layout .grid-content{
-    margin-top: 80px;
+.base_header_layout .grid-content {
+  margin-top: 80px;
 }
-.but{
-    margin-top: 150px;
+.but {
+  margin-top: 150px;
 }
-.el-input--small .el-input__inner{
-    margin-left: 20px;
+.el-input--small .el-input__inner {
+  margin-left: 20px;
 }
 .el-range-editor--small.el-input__inner {
-    height: 32px;
-    margin-left: -20%;
+  height: 32px;
+  margin-left: -20%;
 }
 </style>

src/views/warehouse/warehouseManagementDelete.vue

@@ -22,6 +22,44 @@
       </el-col>
     </el-row>
     <div class="connert">
+      <BaseHeaderLayout :leftSpan="20">
+        <template slot="left">
+          <div style="margin-top: 2px">
+            <el-radio-group
+              v-model="warehouseType"
+              @change="changeradio"
+              size="small"
+            >
+              <el-radio-button label="1">自有库</el-radio-button>
+              <el-radio-button label="2">临时库</el-radio-button>
+            </el-radio-group>
+          </div>
+        </template>
+        <template slot="right">
+          <ws-input
+            v-model="warehouseName"
+            placeholder="请输入仓库名"
+            clearable
+            maxlength="500"
+            type="input"
+            class="findValue"
+          ></ws-input>
+          <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
+          <ws-button class="find" type="primary" @click="find()"
+            ><img
+              width="16"
+              height="16"
+              style="
+                vertical-align: text-top;
+                position: relative;
+                top: 0px;
+                left: -8px;
+              "
+              src="../../../public/img/sousuo.png"
+              alt=""
+          /></ws-button>
+        </template>
+      </BaseHeaderLayout>
       <el-table
         class="wenzi"
         :data="warehouseList"
@@ -37,55 +75,31 @@
         <el-table-column prop="warehouseName" label="仓库名称">
         </el-table-column>
         <el-table-column prop="warehouseLocation" label="仓库所在地">
+          <template scope="scope">
+            {{ scope.row.warehousePrivate }}{{ scope.row.warehouseCity
+            }}{{ scope.row.warehouseArea }}
+          </template>
         </el-table-column>
-        <el-table-column prop="nowStorage" label="应余库存（吨）">
+        <el-table-column prop="residual" label="应余库存（吨）">
         </el-table-column>
-        <el-table-column prop="personCharge;" label="负责人"></el-table-column>
-        <el-table-column prop="address" label="操作" width="200">
-          <!-- <template slot-scope="scope">
+        <el-table-column prop="personCharge" label="负责人"></el-table-column>
+        <el-table-column label="操作" width="200">
+          <template slot-scope="scope">
             <ws-button
               type="primary"
               @click="handleHide(scope.row)"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
               v-if="scope.row.showFlag == 0"
               >显示</ws-button
             >
             <ws-button
               type="primary"
               @click="handleHide(scope.row)"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
               v-if="scope.row.showFlag == 1"
               >隐藏</ws-button
             >
-            <ws-button
-              type="primary"
-              @click="handleDelete(sv-ifcope.row)"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
+            <ws-button type="primary" @click="handleDelete(scope.row)"
               >删除</ws-button
             >
-          </template> -->
-          <template slot-scope="scope">
-            <div
-              class="record"
-              v-if="scope.row.showFlag == 0"
-              @click="handleHide(scope.row)"
-            >
-              显示
-            </div>
-            <div
-              class="record"
-              v-if="scope.row.showFlag == 1"
-              @click="handleHide(scope.row)"
-            >
-              隐藏
-            </div>
-            <div class="adjustment" @click="handleDelete(scope.row)">删除</div>
           </template>
         </el-table-column>
       </el-table>
@@ -144,7 +158,9 @@ export default {
       show: '隐藏',
       // 提交类型
       submitType: true,
+      warehouseName: '',
       size: 10,
+      warehouseType: '1',
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       date: {
@@ -170,11 +186,19 @@ export default {
     returnWarehouse() {
       this.$router.push({ path: 'warehouseManagementList' })
     },
-
+    changeradio(e) {
+      this.getList()
+    },
+    find() {
+      this.currentPage = 1
+      this.getList()
+    },
     //列表
     getList() {
       delectlist({
         compId: sessionStorage.getItem('ws-pf_compId'),
+        warehouseType: this.warehouseType,
+        warehouseName: this.warehouseName,
       })
         .toPromise()
         .then((response) => {
@@ -233,42 +257,42 @@ export default {
           })
       }
     },
-  },
-  handleDelete(row) {
-    // console.log(row)
-    this.$confirm(`此操作永久删除该仓库全部信息，是否确认删除`, {
-      cancelButtonText: '取消',
-      confirmButtonText: '确定',
-      type: 'warning',
-    })
-      .then(() => {
-        deletewarehouse({ id: row.id })
-          .toPromise()
-          .then((response) => {
-            this.$notify.success({
-              title: '成功',
-              message: '删除成功',
-            })
-            this.getList()
-          })
-          .catch((response) => {
-            // console.log(3333)
-            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-          })
-      })
-      .catch(() => {
-        return false
+    handleDelete(row) {
+      // console.log(row)
+      this.$confirm(`此操作永久删除该仓库全部信息，是否确认删除`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
       })
+        .then(() => {
+          deletewarehouse({ id: row.id })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '删除成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+              // console.log(3333)
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    // deletecontract(){},
+    //删除
+    approve() {},
+    listQuery() {},
+    total() {},
+    clearfiltQuery() {},
+    selectCrtDuty() {},
+    delectlist() {},
+    deletewarehouse() {},
   },
-  // deletecontract(){},
-  //删除
-  approve() {},
-  listQuery() {},
-  total() {},
-  clearfiltQuery() {},
-  selectCrtDuty() {},
-  delectlist() {},
-  deletewarehouse() {},
 }
 </script>
 <style lang="scss" scoped>

src/views/warehouse/warehouseManagementList.vue

@@ -17,9 +17,6 @@
         <ws-button @click="handleLook()">查看</ws-button>
         <ws-button @click="handleEdit()">编辑</ws-button>
         <ws-button @click="handleDelete()">删除</ws-button>
-        <ws-button @click="handleLook()">查看</ws-button>
-        <ws-button @click="handleEdit()">编辑</ws-button>
-        <ws-button @click="handleDelete()">删除</ws-button>
       </template>
       <template slot="left">
         <div style="margin-top: 2px">