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

src/api/V2/warehouse/index.js

@@ -37,3 +37,5 @@ export const API_GET_WAREHOUSE_COMPLETE = '/warehouseInOutInfo/selectWarehouseIn
 export const API_POST_WAREHOUSE_DEL_POSITION = '/warehousePositionInfo/api/deleteWarehousePosition'
 //删除待完善记录
 export const API_POST_WAREHOUSE_DEL_INOUTINFO = '/warehouseInOutInfo/api/deleteWarehouse'
+//临时仓库增加
+export const API_POST_WAREHOUSE_ADD = '/warehouseBaseInfo/api/addTemporaryWarehouse'

src/model/warehouse/index.js

@@ -18,7 +18,8 @@ import {
     API_POST_STORAGE_IOSS,
     API_GET_WAREHOUSE_COMPLETE,
     API_POST_WAREHOUSE_DEL_POSITION,
-    API_POST_WAREHOUSE_DEL_INOUTINFO
+    API_POST_WAREHOUSE_DEL_INOUTINFO,
+    API_POST_WAREHOUSE_ADD
 } from '@/api/V2/warehouse'
 // 列表
 export const getList = appRx.get(API_GET_WAREHOUSE_BASEINFO, errorCatcher, errorHandle, filter)
@@ -57,5 +58,8 @@ export const delPosition = appRx.post(API_POST_WAREHOUSE_DEL_POSITION, errorCatc
 //删除待完善记录
 export const delInOut = appRx.post(API_POST_WAREHOUSE_DEL_INOUTINFO, errorCatcher, errorHandle, filter)
 
+//临时库增加add
+export const increase = appRx.post(API_POST_WAREHOUSE_ADD, errorCatcher, errorHandle, filter)
+
 
 

src/views/contractManagement/purchaseContractEdit.vue

@@ -1266,8 +1266,7 @@ 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/warehouse/component/router/index.js

@@ -212,7 +212,7 @@ const warehouseManagementRouter = {
         // module: 'procurement.sparepart.applDetail'
       },
       hidden: true
-    },   
+    },      
   ],
 };
 export default warehouseManagementRouter;

src/views/warehouse/warehouseManagementAdd.vue

@@ -27,7 +27,10 @@
       ref="deptBudgetList"
       :rules="rules"
       :model="deptBudgetList"
-      ><div class="small-title">基本信息</div>
+      >
+      <el-radio v-model="radio" label="1" checked="true">自有库</el-radio>
+      <el-radio v-model="radio" label="2">临时库</el-radio>
+      <div class="small-title">基本信息</div>
       <ws-info-table>
         <!--仓库名称-->
         <ws-form-item label="仓库名称" span="1" prop="warehouseName">
@@ -92,7 +95,7 @@
         </ws-form-item>
 
         <!--总吨量（吨）-->
-        <ws-form-item label="总吨量（吨）" span="1" prop="settlementMethod">
+        <ws-form-item label="总吨量（吨）" span="1" prop="settlementMethod"  v-show="radio==1">
           <ws-input
             class="totalStorage"
             :readonly="true"
@@ -105,6 +108,7 @@
           style="width: 100%"
           class="flex position"
           v-for="(item, index) in freightspace"
+          v-show="radio==1"
         >
           <ws-form-item
             label="仓位编号"
@@ -156,8 +160,9 @@
       </ws-info-table>
     </ws-form>
     <ws-form ref="deptBudgetList" :model="deptBudgetList">
-      <div class="small-title">上传仓库照片</div>
+      <div class="small-title" v-show="radio==1">上传仓库照片</div>
       <ws-upload
+       v-show="radio==1"
         ref="upload"
         table-name="maintain_work_order"
         oss-key="mainPlan"
@@ -193,7 +198,7 @@ import {
   addxiala,
   editxiala,
   delxiala,
-  xiala,
+  increase
 } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -223,6 +228,7 @@ export default {
       selectedOptions: [],
       center: [116.244694, 39.517344],
       window: '',
+      radio: 1,
       polygons: [
         {
           pName: 'Geolocation', //定位