Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

.env.production

@@ -4,7 +4,7 @@
 
 NODE_ENV = 'production'
 # base api
-VUE_APP_BASE_API = 'https://192.168.1.100:8090/'
+VUE_APP_BASE_API = 'http://127.0.0.1:9100/'
 
 # 微服务相关接口配置
 ## 任务消息

src/model/warehouse/index.js

@@ -16,7 +16,7 @@ export const addList = appRx.post(API_POST_ADD_WAREHOUSE_BASEINFO, errorCatcher,
 //仓库查看
 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 deletewarehouse = appRx.get(API_GET_WAREHOUSE_DELETE, errorCatcher, errorHandle, filter)
 // 货名等下拉

src/views/contractManagement/salesContract.vue

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

src/views/warehouse/warehouseManagementDelete.vue

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

src/views/warehouse/warehouseManagementLook.vue

@@ -32,10 +32,10 @@
               @change="selectpackingMethod"
             >
               <ws-option
-                v-for="item in packtypeList"
+                v-for="item in unitList"
                 :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
+                :label="item.warehouseName"
+                :value="item.warehouseName"
               />
             </ws-select>
           </ws-form-item>
@@ -223,6 +223,7 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
+      unitList:[],
       // 提交类型
       submitType: true,
       selectpackingMethod: {},
@@ -252,7 +253,7 @@ export default {
     // this.getVesselData();
     // this.getList()
     this.loaddata()
-    this.getLook()
+    //this.getLook()
     this.showType = this.isShow
   },
   methods: {
@@ -297,12 +298,19 @@ export default {
     },
     loaddata() {
       // 仓库名称
-      xiala({ compId: 'CON1' })
+      xiala({ compId: sessionStorage.getItem('ws-pf_compId')})
         .toPromise()
         .then((response) => {
           this.packtypeList = response
         })
         this.getUnitList()
+
+         // 数据
+      getLook({ id:this.compId })
+        .toPromise()
+        .then((response) => {
+          this.deptBudgetList = response
+        })
     },
     getUnitList() {
       xiala({
@@ -321,7 +329,7 @@ export default {
           })
           //
           if (currItem) {
-            this.selectContract(currItem.constValue)
+            this.getLook(currItem.constValue)
           }
         })
     },

vue.config.js

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