소스 검색

前端mxx

gjy 4 년 전
부모
커밋
f6a2c6cb7e
3개의 변경된 파일5개의 추가작업 그리고 11개의 파일을 삭제
  1. 0 3
      src/model/warehouse/index.js
  2. 2 5
      src/views/contractManagement/salesContract.vue
  3. 3 3
      src/views/warehouse/warehouseManagementDelete.vue

+ 0 - 3
src/model/warehouse/index.js

@@ -12,9 +12,6 @@ export const getList = appRx.get(API_GET_WAREHOUSE_BASEINFO, errorCatcher, error
 export const getLook = appRx.get( API_GET_WAREHOUSE_LOOK, errorCatcher, errorHandle, filter)
 export const getLook = appRx.get( API_GET_WAREHOUSE_LOOK, errorCatcher, errorHandle, filter)
 //仓库下拉
 //仓库下拉
 export const xiala = appRx.get( API_GET_WAREHOUSE_CUSTOMDROPDOWN, errorCatcher, errorHandle, filter)
 export const xiala = appRx.get( API_GET_WAREHOUSE_CUSTOMDROPDOWN, errorCatcher, errorHandle, filter)
-
-// 列表
-export const getList = appRx.get(API_GET_WAREHOUSE_BASEINFO, errorCatcher, errorHandle, filter)
 //删除
 //删除
 export const deletewarehouse = appRx.get(API_GET_WAREHOUSE_DELETE, errorCatcher, errorHandle, filter)
 export const deletewarehouse = appRx.get(API_GET_WAREHOUSE_DELETE, errorCatcher, errorHandle, filter)
 
 

+ 2 - 5
src/views/contractManagement/salesContract.vue

@@ -620,12 +620,9 @@ export default {
 
 
     handleDelete(row) {
     handleDelete(row) {
       var handleDelete = ' '
       var handleDelete = ' '
-      if (row.handleDelete == '待执行' || row.handleDelete == '已完成') {
-        handleDelete = '执行中'
-      } else if (row.handleDelete == '执行中') {
-        handleDelete = '已完成'
+      if (row.handleDelete =='') {
       }
       }
-      this.$confirm(`合同删除后不可恢复,是否继续删除?`, '提示', {
+      this.$confirm(`此操作永久删除该仓库全部信息,是否确认删除`, {
         cancelButtonText: '取消',
         cancelButtonText: '取消',
         confirmButtonText: '确定',
         confirmButtonText: '确定',
         type: 'warning',
         type: 'warning',

+ 3 - 3
src/views/warehouse/warehouseManagementDelete.vue

@@ -1,6 +1,6 @@
+//删除仓库
 <template>
 <template>
-  <div >
-      
+  <div > 
      <el-row>
      <el-row>
       <el-col :span="20">
       <el-col :span="20">
         <h2 class="bg-left title">删除仓库</h2>
         <h2 class="bg-left title">删除仓库</h2>
@@ -388,7 +388,7 @@ export default {
               this.getList()
               this.getList()
             })
             })
             .catch((response) => {
             .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              
             })
             })
         })
         })
         .catch(() => {
         .catch(() => {