前端sdy

package.json

@@ -43,6 +43,7 @@
   },
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
+    "@babel/preset-env": "^7.14.4",
     "axios": "^0.20.0",
     "babel-polyfill": "^6.26.0",
     "base-core-lib": "^1.3.16",
@@ -78,7 +79,7 @@
     "xe-utils": "^2.3.0"
   },
   "devDependencies": {
-    "@babel/core": "7.0.0",
+    "@babel/core": "^7.0.0",
     "@babel/register": "7.0.0",
     "@pixul/node-rancher-api": "^1.4.0",
     "@vue/cli-plugin-babel": "3.6.0",

src/api/V2/warehouse/index.js

@@ -5,6 +5,14 @@ export const API_GET_WAREHOUSE_LOOK = '/warehouseBaseInfo/getWarehouse'
 //仓库名称下拉
 export const API_GET_WAREHOUSE_CUSTOMDROPDOWN = '/warehouseBaseInfo/selectWarehouse'
 
+//删除
+export const API_POST_WAREHOUSE_DELETE = '/warehouseBaseInfo/api/deleteWarehouse'
+//删除仓库列表
+export const API_GET_WAREHOUSE_DELETELIST ='/warehouseBaseInfo/selectAllWarehouse'
+//隐藏
+export const API_POST_WAREHOUSE_HIDE ='/warehouseBaseInfo/api/editShow'
+
+
 export const API_GET_WAREHOUSE_DELETE = '/warehouseBaseInfo/api/deleteWarehouse'
 
 //仓库编辑
@@ -18,6 +26,11 @@ export const API_POST_WAREHOUSE_NAME = '/warehousePositionStorageInfo/selectGood
 export const API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN = `/commonSysParameter/getInfo`
 // 入库添加
 export const API_POST_STORAGE_PUT = `/warehouseInOutInfo/InOutWarehouse `
+
 //盘损提交
 export const API_POST_STORAGE_IOSS = '/warehouseInventoryCountInfo/addInventory'
 
+
+//待完善记录
+export const API_GET_WAREHOUSE_COMPLETE = '/warehouseInOutInfo/selectWarehouseInOutInfo'
+

src/model/warehouse/index.js

@@ -5,14 +5,18 @@ import {
     API_POST_ADD_WAREHOUSE_BASEINFO,
     API_GET_WAREHOUSE_LOOK,
     API_GET_WAREHOUSE_CUSTOMDROPDOWN,
-    API_GET_WAREHOUSE_DELETE,
+    API_POST_WAREHOUSE_DELETE,
+    API_GET_WAREHOUSE_DELETELIST,
+    API_POST_WAREHOUSE_HIDE,
+    // API_GET_WAREHOUSE_DELETE,
     API_POST_WAREHOUSE_EDIT,
     API_GET_WAREHOUSE_IOSS,
     API_POST_WAREHOUSE_NAME,
     API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN,
     API_POST_STORAGE_PUT,
-    API_POST_STORAGE_IOSS
-     
+    API_POST_STORAGE_IOSS,
+     API_GET_WAREHOUSE_COMPLETE,
+
 } from '@/api/V2/warehouse'
 // 列表
 export const getList = appRx.get(API_GET_WAREHOUSE_BASEINFO, errorCatcher, errorHandle, filter)
@@ -23,14 +27,19 @@ export const getLook = appRx.get(API_GET_WAREHOUSE_LOOK, errorCatcher, errorHand
 //仓库下拉
 export const xiala = appRx.get( API_GET_WAREHOUSE_CUSTOMDROPDOWN, errorCatcher, errorHandle, filter)
 //删除
-export const deletewarehouse = appRx.get(API_GET_WAREHOUSE_DELETE, errorCatcher, errorHandle, filter)
+
+export const deletewarehouse = appRx.post(API_POST_WAREHOUSE_DELETE, errorCatcher, errorHandle, filter)
+//删除库房列表
+export const delectlist = appRx.get(API_GET_WAREHOUSE_DELETELIST, errorCatcher, errorHandle, filter)
+//隐藏
+export const hide = appRx.post(API_POST_WAREHOUSE_HIDE, errorCatcher, errorHandle, filter)
+
 //仓库编辑
 export const edit = appRx.post(API_POST_WAREHOUSE_EDIT, errorCatcher, errorHandle, filter)
 //盘损
 export const ioss = appRx.get(API_GET_WAREHOUSE_IOSS, errorCatcher, errorHandle, filter)
 //货名下拉
 export const goodsname = appRx.get(API_POST_WAREHOUSE_NAME, errorCatcher, errorHandle, filter)
-
 // 货名等下拉
 export const pullDown = appRx.get(API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN, errorCatcher, errorHandle, filter)
 // 入库添加
@@ -38,3 +47,7 @@ export const addstorageputList = appRx.post(API_POST_STORAGE_PUT, errorCatcher,
 //盘损提交
 export const submitioss = appRx.post(API_POST_STORAGE_IOSS, errorCatcher, errorHandle, filter)
 
+//待完善记录
+export const complete = appRx.get(API_GET_WAREHOUSE_COMPLETE, errorCatcher, errorHandle, filter)
+
+

src/views/warehouse/warehouseManagementDelete.vue

@@ -18,36 +18,47 @@
    <div class="connert">
       <el-table
         class="wenzi"
-        :data="contractList.records"
+        :data="warehouseList"
         style="width: 100%; margin-top: 20px"
         height="780"
       >
-         <el-table-column type="index" label="序号">
+         <el-table-column type="index" label="序号" >
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
           <span v-else>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column> 
-        <el-table-column prop="contractNo" label="仓库名称" >
+        <el-table-column prop="warehouseName" label="仓库名称" >
         </el-table-column>
-        <el-table-column prop="goodsName" label="仓库所在地" >
+        <el-table-column prop="warehouseLocation" label="仓库所在地" >
         </el-table-column>
-        <el-table-column prop="weight" label="应余库存（吨）"> </el-table-column>
-        <el-table-column prop="unitContractPrice" label="负责人">
+        <el-table-column prop="nowStorage" 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"> -->
+          <template slot-scope="scope" >
             <ws-button
               type="primary"
-              @click="handleAdd()"
+              @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(scope.row)"
@@ -56,7 +67,7 @@
               "
               >删除</ws-button
             >
-          <!-- </template> -->
+          </template>
         </el-table-column>
       </el-table>
       
@@ -66,7 +77,10 @@
 <script>
 
 import{
-  deletewarehouse
+  getList,
+  delectlist,
+  deletewarehouse,
+  hide,
 } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
@@ -88,7 +102,7 @@ export default {
   },
   data() {
     return {
-      
+      isshow:false,
       //弹出框
       dialogViewSpareMoney: false,
       dialogApproveFormVisible: false,
@@ -108,7 +122,9 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
-
+      warehouseList:[],
+      scope:[],
+      show:'隐藏',
       // 提交类型
       submitType: true,
       size: 10,
@@ -121,264 +137,96 @@ export default {
       contractList: [],
       deptBudgetList: {},
       historyList: [],
-
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
         },
       },
       accessoryTFs: false,
-      taskTypeList: [
-        { value: '未完成', type: 1 },
-        { value: '已完成', type: 2 },
-        { value: '全部合同', type: '' },
-      ],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: '本周',
-            onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              var thisDay = start.getDay()
-              var thisDate = start.getDate()
-              if (thisDay != 0) {
-                start.setDate(thisDate - thisDay)
-              }
-              picker.$emit('pick', [start, end])
-            },
-          },
-          {
-            text: '本月',
-            onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setDate(1)
-              picker.$emit('pick', [start, end])
-            },
-          },
-          {
-            text: '本季度',
-            onClick(picker) {
-              var oDate = new Date()
-
-              var thisYear = oDate.getFullYear()
-              var thisMonth = oDate.getMonth() + 1
-
-              var n = Math.ceil(thisMonth / 3) // 季度
-
-              var Month = n * 3 - 1
-
-              var start = new Date(thisYear, Month - 2, 1)
-              var end = new Date()
-
-              picker.$emit('pick', [start, end])
-            },
-          },
-        ],
-      },
-      value1: '',
-      value2: '',
     }
   },
   activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
-    // this.deletewarehouse()
-    // this.getList()
-  
+  this.getList()
     this.showType = this.isShow
   },
   methods: {
-    handleDelete(){
-      this.$router.push({ path : 'warehouseManagementDelete'})
-    },
     returnWarehouse(){
       this.$router.push({ path: 'warehouseManagementList' })
     },
-    dateFormat(fmt, date) {
-      let ret
-      const opt = {
-        'Y+': date.getFullYear().toString(), // 年
-        'm+': (date.getMonth() + 1).toString(), // 月
-        'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString(), // 时
-        // "M+": date.getMinutes().toString(),         // 分
-        // "S+": date.getSeconds().toString()          // 秒
-        // 有其他格式化字符需求可以继续添加，必须转化成字符串
-      }
-      for (let k in opt) {
-        ret = new RegExp('(' + k + ')').exec(fmt)
-        if (ret) {
-          fmt = fmt.replace(
-            ret[1],
-            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-          )
-        }
-      }
-      return fmt
-    },
     
-    getList() {
-      getList({
+    //列表
+     getList() {
+      delectlist({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
-        startDate: this.startDate,
-        endDate: this.endDate,
-        contrPage: this.contrPage,
       })
         .toPromise()
         .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray = response.records[
-                i
-              ].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
-            }
-          }
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.contractList = response
+          this.warehouseList = response
         })
     },
-    // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-
-      // this.deptBudgetList.
-      // this.formData.append('files', files)
-      // this.feedbackObj.uploadNameAttachment = data.appendixName
-      // this.feedbackObj.pathUploadAttachment = data.appendixPath
-      // // this.newAppendixs = files
-      // this.onChangeFlag = true
+    handleExamine(row) {
+      this.$router.push({
+        name: 'salesContractExamine',
+        query: { id: row.id },
+      })
     },
-    editClick(row) {
-      var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
-        status = '执行中'
-      } else if (row.status == '执行中') {
-        status = '已完成'
-      }
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`是否将状态改为${status}`, {
-        confirmButtonText: '确定',
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleCloe() {
+      this.dialogViewSpareMoney = false
+    },
+    //隐藏
+    handleHide(row) { 
+      console.log(row.showFlag)
+      if(row.showFlag==1){
+        this.$confirm(`隐藏后将对其他用户不可见，是否确认隐藏`, {
         cancelButtonText: '取消',
+        confirmButtonText: '确定',
         type: 'warning',
       })
         .then(() => {
-          editstatus({ id: row.id })
+        hide({ id: row.id})
             .toPromise()
             .then((response) => {
               this.$notify.success({
                 title: '成功',
-                message: '状态修改成功',
+                message: '隐藏成功',
               })
               this.getList()
             })
             .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              // console.log(3333)
+             // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
             })
         })
         .catch(() => {
           return false
         })
-    },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
-        }
-      }
-    },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
+      }else{
+        hide({ 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'))
+            })
       }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
-    },
-
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      console.log(row)
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
-        })
-    },
-    find() {
-      this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-      this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-      this.currentPage = 1
-      this.getList()
-    },
-    async exportlist() {
-      const { data } = await export1(
-        {
-          compId: sessionStorage.getItem('ws-pf_compId'),
-          contractType: this.contractType,
-          currentPage: this.currentPage,
-          pageSize: this.pageSize,
-          searchType: this.searchType,
-          searchKeyWord: this.searchKeyWord,
-          startDate: this.startDate,
-          endDate: this.endDate,
-        },
-        {},
-        { responseType: 'blob' }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }_采购合同`,
-        type: 'xls',
-      })
+    }   
     },
-    // deletecontract(){},
-    //删除
-    approve() {},
-    listQuery() {},
-    total() {},
-    clearfiltQuery() {},
-    selectCrtDuty() {},
-  },
-  handleDelete(row) {
-      var handleDelete = ' '
-      if (row.handleDelete =='') {
-      }
+    handleDelete(row) {
+      // console.log(row)
       this.$confirm(`此操作永久删除该仓库全部信息，是否确认删除`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
         type: 'warning',
       })
         .then(() => {
-          deletewarehouse({ id: row.id })
+        deletewarehouse({ id: row.id})
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -388,14 +236,24 @@ export default {
               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(){},
+    }
 </script>
 <style lang="scss" scoped>
 .connert {
@@ -406,5 +264,4 @@ export default {
   width: 62px;
   text-align: right;
 }
-
 </style>

src/views/warehouse/warehouseManagementList.vue

@@ -119,7 +119,7 @@
           <template slot-scope="scope">
             <ws-button
               type="primary"
-              @click="nocomplete()"
+              @click="nocomplete(scope.row)"
               v-hasPermission="
                 `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
               "
@@ -222,6 +222,7 @@ export default {
       submitType: true,
       size: 10,
       spanArr: [],
+
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       date: {
@@ -305,9 +306,16 @@ export default {
         // }
       })
     },
-    //待完成
-    nocomplete() {
-      this.$router.push({ path: 'warehouseManagementNoComplete' })
+    //待完成//传参
+    nocomplete(row) {
+      console.log(row)
+      this.$router.push({
+        path: 'warehouseManagementNoComplete',
+        query:{baseId:row.warehouseId,
+              positionId:row.binNumberId,
+        }                                                                                                                                                                                                                                                                                                                                                          
+        })
+      
     },
     //记录
     record() {

src/views/warehouse/warehouseManagementLook.vue

@@ -254,7 +254,7 @@ export default {
         .toPromise()
         .then((response) => {
          this.deptBudgetList=response
-         console.log(this.deptBudgetList)
+        //  console.log(this.deptBudgetList)
         })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -24,22 +24,22 @@
               <span v-else>{{ scope.$index + 1 }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="contractNo" label="货名"> </el-table-column>
-          <el-table-column prop="goodsName" label="毛重（吨）"></el-table-column>
-          <el-table-column prop="weight" label="皮重（吨）"> </el-table-column>
-          <el-table-column prop="unitContractPrice" label="净重（吨）"></el-table-column>   
-          <el-table-column prop="packingMethod" label="品级"> </el-table-column>
-          <el-table-column prop="buyer" label="出入库日期"> </el-table-column>
+          <el-table-column prop="goodsName" label="货名"> </el-table-column>
+          <el-table-column prop="tare" label="毛重（吨）"></el-table-column>
+          <el-table-column prop="grossWeight" label="皮重（吨）"> </el-table-column>
+          <el-table-column prop="netWeight" label="净重（吨）"></el-table-column>   
+          <el-table-column prop="grade" label="品级"> </el-table-column>
+          <el-table-column prop="inOutDate" label="出入库日期"> </el-table-column>
           <el-table-column prop="buyer" label="类型"> </el-table-column>
-          <el-table-column prop="buyer" label="合同编号"> </el-table-column>
-          <el-table-column prop="buyer" label="车牌号"> </el-table-column>
-          <el-table-column prop="buyer" label="经办人"> </el-table-column>
-          <el-table-column prop="buyer" label="内勤"> </el-table-column>
-          <el-table-column prop="buyer" label="保存时间"> </el-table-column>
+          <el-table-column prop="contractNo" label="合同编号"> </el-table-column>
+          <el-table-column prop="carNo" label="车牌号"> </el-table-column>
+          <el-table-column prop="agent" label="经办人"> </el-table-column>
+          <el-table-column prop=" backOffice" label="内勤"> </el-table-column>
+          <el-table-column prop="updateDate" label="保存时间"> </el-table-column>
           <el-table-column prop="address" label="操作" width="200">
           <ws-button
             type="primary"
-            @click="edits()"
+            @click="edits(scope.row)"
             v-hasPermission="
               `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
             "
@@ -47,7 +47,7 @@
           >
           <ws-button
             type="primary"
-            @click="deletes()"
+            @click="handleDelete(scope.row)"
             v-hasPermission="
               `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
             "
@@ -71,11 +71,13 @@
 </template>
 <script>
 import {
+  complete,
   getList,
   export1,
   editstatus,
   billoperatehis,
-} from '@/model/contarct/index'
+  deletewarehouse,
+} from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -115,6 +117,11 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
+      deletewarehouse:[],
+      pageSize:10,
+      currentPage:'1',
+      
+
       // 提交类型
       submitType: true,
       selectpackingMethod: {},
@@ -129,7 +136,8 @@ export default {
       contractList: [],
       deptBudgetList: {},
       historyList: [],
-
+      deletewarehouse:[],
+    // inOutDate:null,
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -142,17 +150,27 @@ export default {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
-    this.getList()
+    
+    //接参
+    this.getList(this.$route.query.baseId,this.$route.query.positionId)
     this.showType = this.isShow
   },
   methods: {
+
+    //编辑
+     edits(row){
+       this.$router.push({
+         name:'warehouseManagementPerfectput',
+         query: { baseId:row.baseId, positionId:row.positionId, pageSize:row.pageSize, currentPage: row.currentPage },
+       })
+     },
     //返回按钮
     returnWarehouse() {
       this.$router.push({ path: 'warehouseManagementList' })
     },
     //删除
     deletes(){
-
+     this.$router.push({path:'warehouseManagementDelete'})
     },
     //编辑
     edits(){
@@ -193,63 +211,60 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    getList() {
-      getList({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
-        startDate: this.startDate,
-        endDate: this.endDate,
-        contrPage: this.contrPage,
-      })
-        .toPromise()
+  //收
+  getList(id,id1){
+   complete({
+          // compId: sessionStorage.getItem('ws-pf_compId'),
+          baseId:id,
+          positionId:id1,
+          pageSize:this.pageSize,
+          currentPage:this.currentPage,
+          // inOutDate:this.inOutDate
+    })
+    .toPromise()
         .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray = response.records[
-                i
-              ].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
-            }
-          }
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.contractList = response
+          this.getList = response
         })
     },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
-        }
-      }
-    },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
+    // complete(){
+    //   complete({
+
+    //   })
+    // },
+
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
         query: { id: row.id },
       })
     },
-
+    //删除
+      handleDelete(row) {
+      // console.log(row)
+      this.$confirm(`删除后不可恢复，确认删除？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      })
+        .then(() => {
+        deletewarehouse({ baseId:row.baseId, positionId:row.positionId, pageSize:row.pageSize, currentPage: row.currentPage })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '删除成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+              
+            })
+        })
+        .catch(() => {
+          return false
+        })
+      }
+    },
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleCloe() {
       this.dialogViewSpareMoney = false
@@ -299,8 +314,8 @@ export default {
     total() {},
     clearfiltQuery() {},
     selectCrtDuty() {},
-  },
-}
+  }
+
 </script>
 <style lang="scss" scoped>
 .center {

src/views/warehouse/warehouseManagementPut.vue

@@ -547,13 +547,16 @@ export default {
   overflow: scroll;
   height: 120vh;
 }
-/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
+
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+
   text-align: center;
 }
 .deliverydate {
   width: 35%;
 }
-.center[data-v-32a9842f] {
+.center {
+
   margin-top: -60px;
 }
 </style>

vue.config.js

@@ -144,7 +144,9 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.124:8090/',
+
         target: 'http://192.168.1.119:8090/',
+
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址