3 years ago · ac5eeb2318
--- a/public/index.html
+++ b/public/index.html
@@ -1,7 +1,7 @@
 
															 <!DOCTYPE html>
														
 
															 <html>
														
 
															   <head>
														
 
															-    <meta charset="gbk">
														
 
															+    <meta charset="utf-8">
														
 
															     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
														
 
															     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
														
 
															     <link rel="icon" href="<%= BASE_URL %>favicon.png">
														
--- a/src/api/supply/reserve.js
+++ b/src/api/supply/reserve.js
@@ -79,4 +79,15 @@ export function getWarehouseList(params) {
 
															     method: 'get',
														
 
															     params
														
 
															   })
														
 
															-}
														
 
															+}
														
 
															+
														
 
															+
														
 
															+// 获取仓库列表
														
 
															+export function getListStock(params) {
														
 
															+  return request({
														
 
															+    url: '/reserve/listStock',
														
 
															+    method: 'get',
														
 
															+    params
														
 
															+  })
														
 
															+}
														
 
															+
														
--- a/src/views/supply/engin/engin_list.vue
+++ b/src/views/supply/engin/engin_list.vue
@@ -184,8 +184,8 @@
 
															                 {{scope.row.totalAmount | numToFixed}}
														
 
															               </template>
														
 
															             </el-table-column>
														
 
															-            <el-table-column align="left" label="乘以已订数量" prop="hasOrderQty" min-width="100" show-overflow-tooltip></el-table-column>
														
 
															-             <!-- <el-table-column align="left" label="表体业务员" prop="itemServiceName" min-width="100" show-overflow-tooltip></el-table-column> -->
														
 
															+            <el-table-column align="left" label="已订数量" prop="hasOrderQty" min-width="100" show-overflow-tooltip></el-table-column>
														
 
															+             <el-table-column align="left" label="表体业务员" prop="itemServiceName" min-width="100" show-overflow-tooltip></el-table-column>
														
 
															             <el-table-column align="left" label="表头业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
														
 
															             <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
														
 
															             <el-table-column align="left" label="制表人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
														
--- a/src/views/supply/reserve/components/reserve_form.vue
+++ b/src/views/supply/reserve/components/reserve_form.vue
@@ -318,7 +318,7 @@
 
															 </template>
														
 
															 <script>
														
 
															-import { getDetail, getGoodsList, addData, editData, checkDealerList, checkMaterialList, getWarehouseList } from "@/api/supply/reserve";
														
 
															+import { getDetail, getGoodsList, addData, editData, checkDealerList, checkMaterialList, getWarehouseList ,getListStock} from "@/api/supply/reserve";
														
 
															 import { getDictList } from '@/api/common'
														
 
															 let that
														
@@ -392,6 +392,7 @@ export default {
 
															   async created() {
														
 
															     await this.getWarehouseList();
														
 
															+    // await this.getListStock()
														
 
															     if(this.listItem) {
														
 
															       this.getDetail();
														
 
															     }else {
														
@@ -401,6 +402,11 @@ export default {
 
															   },
														
 
															   methods: {
														
 
															+    getListStock(){
														
 
															+      getListStock({customerId:JSON.parse(localStorage.getItem("supply_user")).customerId}).then(res=>{
														
 
															+        console.log(res,'123');
														
 
															+      })
														
 
															+    },
														
 
															     getDate() {
														
 
															       var date = new Date();
														
 
															       var seperator1 = "-";