前端

src/api/V2/tradeServicesManagement/index.js

@@ -1,5 +1,10 @@
 //仓库列表查看
 export const API_GET_WAREHOUSE_LOOK = '/warehouseBaseInfo/getWarehouse'
-
-
-
+//仓单列表添加
+export const API_POST_WAREHOUSE_ADD = '/warehouseBaseInfo/getWarehouse'
+//仓单查看
+export const API_GET_WAREHOUSE_LIST = '/warehouseBaseInfo/getWarehouse'
+//仓单编辑
+export const API_POST_WAREHOUSE_EDIT = '/warehouseBaseInfo/getWarehouse'
+// 获取业务编号
+export const API_GET_BILLNO = '/tradeWarehouseReceiptAppl/getBillNo'

src/model/tradeServicesManagement/index.js

@@ -1,8 +1,20 @@
 import { errorCatcher, errorHandle, filter } from 'base-core-lib'
 import { appRx } from '../defalutConfig/indexRx'
 import {
-    API_GET_WAREHOUSE_BASEINFO
+    API_GET_WAREHOUSE_BASEINFO,
+    API_POST_WAREHOUSE_ADD,
+    API_GET_WAREHOUSE_LIST,
+    API_POST_WAREHOUSE_EDIT,
+    API_GET_BILLNO
 } from '@/api/V2/tradeServicesManagement'
 
 // 列表
 export const getList = appRx.get(API_GET_WAREHOUSE_BASEINFO, errorCatcher, errorHandle, filter)
+// 添加
+export const addList = appRx.Post(API_POST_WAREHOUSE_ADD, errorCatcher, errorHandle, filter)
+// 查看
+export const getwarehousewarrantList = appRx.Post(API_GET_WAREHOUSE_LIST, errorCatcher, errorHandle, filter)
+// 编辑
+export const editList = appRx.Post(API_POST_WAREHOUSE_EDIT, errorCatcher, errorHandle, filter)
+// 获取业务编号
+export const getbillno = appRx.Post(API_GET_BILLNO, errorCatcher, errorHandle, filter)

src/views/tradeServicesManagement/warehouseReceiptAdd.vue

@@ -8,29 +8,29 @@
     >
       <!-- <ws-info-table class="el-table"> -->
 		  <div>申请信息</div>
-        <el-form-item label="业务编号" span="1" prop="taskNo" class="forlist">
+        <el-form-item label="业务编号" span="1" prop="billNo" class="forlist">
           <el-input
-            v-model="deptBudgetList.taskNo"
+            v-model="deptBudgetList.billNo"
             placeholder="请输入任务编号"
             maxlength="20"
             size="small"
             disabled
           ></el-input>
         </el-form-item>
-		<el-form-item label="名头" span="1" prop="taskNo" class="forlist">
-		  	<el-select v-model="deptBudgetList.region" placeholder="请选择名头">
+		<el-form-item label="名头" span="1" prop="renown" class="forlist">
+		  	<el-select v-model="deptBudgetList.renown" placeholder="请选择名头">
 				<el-option label="区域一" value="shanghai"></el-option>
 				<el-option label="区域二" value="beijing"></el-option>
 			</el-select>
         </el-form-item>
-		<el-form-item label="仓库名称" span="1" prop="taskNo" class="forlist">
-         	<el-select v-model="deptBudgetList.region" placeholder="请选择仓库">
+		<el-form-item label="仓库名称" span="1" prop="warehouseName" class="forlist">
+         	<el-select v-model="deptBudgetList.warehouseName" placeholder="请选择仓库">
 				<el-option label="区域一" value="shanghai"></el-option>
 				<el-option label="区域二" value="beijing"></el-option>
 			</el-select>
         </el-form-item>
-		<el-form-item label="仓位号" span="1" prop="taskNo" class="forlist">
-         	<el-select v-model="deptBudgetList.region" placeholder="请选择仓位号">
+		<el-form-item label="仓位号" span="1" prop="warehouseNo" class="forlist">
+         	<el-select v-model="deptBudgetList.warehouseNo" placeholder="请选择仓位号">
 				<el-option label="区域一" value="shanghai"></el-option>
 				<el-option label="区域二" value="beijing"></el-option>
 			</el-select>
@@ -44,17 +44,17 @@
           ></el-input>
         </el-form-item>
         <el-form-item prop="goodsName" label="货名" span="1">
-            <el-select v-model="deptBudgetList.region" placeholder="请选择货名">
+            <el-select v-model="deptBudgetList.goodsName" placeholder="请选择货名">
 				<el-option label="区域一" value="shanghai"></el-option>
 				<el-option label="区域二" value="beijing"></el-option>
 			</el-select>
         </el-form-item>
-		<el-form-item prop="goodsName" label="货名" span="1">
+		<!-- <el-form-item prop="goodsName" label="货名" span="1">
             <el-select v-model="deptBudgetList.region" placeholder="请选择货名">
 				<el-option label="区域一" value="shanghai"></el-option>
 				<el-option label="区域二" value="beijing"></el-option>
 			</el-select>
-        </el-form-item>
+        </el-form-item> -->
 		<el-form-item prop="goodsName" label="品级" span="1">
             <el-select v-model="deptBudgetList.region" placeholder="请选择品级">
 				<el-option label="区域一" value="shanghai"></el-option>
@@ -145,30 +145,48 @@
 	</div>
 </template>
 <script>
-	import {
-		getList,
-	} from '@/model/tradeServicesManagement/index'
-	import WsUpload from '@/components/WsUpload'
-	export default {
-		components: {
-			WsUpload,
-		},
-		data() {
-			return {
-				deptBudgetList:{},
-				size: 10,
-				compId: sessionStorage.getItem('ws-pf_compId'),
-			}
-		},
-		activated() {
+import {
+		addList,
+		getbillno
+} from '@/model/tradeServicesManagement/index'
+import WsUpload from '@/components/WsUpload'
+export default {
+	components: {
+		WsUpload,
+	},
+	data() {
+		return {
+			deptBudgetList:{},
+			size: 10,
+			compId: sessionStorage.getItem('ws-pf_compId'),
+		}
+	},
+	activated() {
 			
-		},
-		methods: {
+	},
+	methods: {
+			getList(){
+				getbillno.toPromise().then((response) => {
+						console.log(response)
+					})
+			},
 		inoutput(){
 			this.$router.push({ name: 'inOutRecord' })
 		},
 		submit(){
-
+			this.$confirm(`确定提交审核？`, {
+                  cancelButtonText: '取消',
+                  confirmButtonText: '确定',
+                  type: 'warning',
+                }).then(() => {
+					addList().toPromise().then((response) => {
+						// this.tableData = response.records
+						 this.$message.success('提交成功')
+					}).catch((req) => {
+						// this.tableData = response.records
+						 this.$message.success('提交失败')
+					})
+			})
 		},
 		onChange() {
 			this.$refs.upload
@@ -180,9 +198,9 @@
 				EventBus.$emit('error', (JSON.parse(res) || {}).message)
 				this.$refs.upload.clearFiles()
 				})
-			},
 		},
-	}
+	},
+}	
 </script>
 <style lang="scss" scoped>
 .el-form{

src/views/tradeServicesManagement/warehouseReceiptEdit.vue

@@ -137,7 +137,7 @@
         </el-form-item>
 		<div>
 			 <el-button @click='inoutput' type="primary">出入库记录</el-button>
-			  <el-button @click='submit'  type="primary">提交审核</el-button>
+			  <el-button @click='submit'  type="primary">重提交</el-button>
 		</div>
 		<div>审核记录</div>
 		 <el-table
@@ -165,7 +165,8 @@
 </template>
 <script>
 	import {
-		getList,
+		getwarehousewarrantList,
+    editList
 	} from '@/model/tradeServicesManagement/index'
 	import WsUpload from '@/components/WsUpload'
 	export default {
@@ -180,14 +181,25 @@
 			}
 		},
 		activated() {
-			
+			this.getList()
 		},
 		methods: {
 		inoutput(){
 			this.$router.push({ name: 'inOutRecord' })
 		},
+    getList(){
+      getwarehousewarrantList.toPromise().then((response) => {
+        this.deptBudgetList=response
+      })
+    },
 		submit(){
-
+      editList().toPromise().then((response) => {
+						// this.tableData = response.records
+						 this.$message.success('提交成功')
+					}).catch((req) => {
+						// this.tableData = response.records
+						 this.$message.success('提交失败')
+					})
 		},
 		onChange() {
 			this.$refs.upload