diff --git a/supervise-crm-ui/src/assets/images/addImg.png b/supervise-crm-ui/src/assets/images/addImg.png
new file mode 100644
index 00000000..0c2a1628
Binary files /dev/null and b/supervise-crm-ui/src/assets/images/addImg.png differ
diff --git a/supervise-crm-ui/src/views/project/projectAdd.vue b/supervise-crm-ui/src/views/project/projectAdd.vue
index c824695c..60b6f6ba 100644
--- a/supervise-crm-ui/src/views/project/projectAdd.vue
+++ b/supervise-crm-ui/src/views/project/projectAdd.vue
@@ -216,6 +216,22 @@
             </el-col>
 
           </el-row>
+
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">关联仓库</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item class="trightb_item">
+                <div class="Images" @click="addImg()">
+                  <img src="../../assets//images//addImg.png" alt="">
+                  <p>添 加 关 联 仓 库</p>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
 
       </div>
@@ -273,7 +289,9 @@
       this.projtypedictionary() // 类型字典信息
     },
     methods: {
-
+      addImg(){
+        console.log(6);
+      },
       loanbankinformation() {
         req.getLoanbankinformation().then((res) => {
           if (res.success) {
@@ -533,4 +551,24 @@
   /deep/ .el-collapse-item__content {
     padding-bottom: 0;
   }
+  .Images{
+    width: 150px;
+    height: 100px;
+    margin: 10px 10px 30px 10px;
+  }
+  .Images img{
+    width: 100px;
+    height: 100px;
+    margin-left: 24px;
+  }
+  .Images p{
+    color: #B8B8B8;
+    font-weight: 600;
+    font-size: 14px;
+    text-align: center;
+    margin-top: -30px;
+  }
+  .Images:hover p{
+    color: #b8b8b8b0;
+  }
 </style>
diff --git a/supervise-crm-ui/src/views/project/projectInfo.vue b/supervise-crm-ui/src/views/project/projectInfo.vue
index 983026c4..d9bbf091 100644
--- a/supervise-crm-ui/src/views/project/projectInfo.vue
+++ b/supervise-crm-ui/src/views/project/projectInfo.vue
@@ -189,8 +189,11 @@
             </el-col>
             <el-col :span="20">
               <el-form-item class="trightb_item">
-                <div v-for="(item,i) in temps"  :key="i">
-                  <img :src="item.picUrl" alt="">
+                <div class="Images" v-for="(item,i) in temps"  :key="i">
+                  <a  :href="'http://jianguan.yyundong.com/warehouse/#/pictureList/pictureList?id='+item.sid" target="_blank">
+                    <img :src="item.picUrl" alt="">
+                    <p><u class="Atext">{{ item.name }}</u></p>
+                  </a>
                 </div>
               </el-form-item>
             </el-col>
@@ -274,4 +277,26 @@
   /deep/ .el-collapse-item__content {
     padding-bottom: 0;
   }
+  .Images{
+    width: 150px;
+    height: 100px;
+    float: left;
+    margin: 10px 20px 40px 10px;
+  }
+  .Images img{
+    width: 100%;
+    height: 100%;
+  }
+  .Images:hover p{
+    color: #018ad2;
+    text-decoration: underline;
+  }
+  .Images p{
+    color: #000;
+    text-align: center;
+    margin-top: -15px;
+  }
+  .Images p .Atext{
+    text-decoration: none;
+  }
 </style>
diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/add/productAdd.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/add/productAdd.vue
index 17dea809..fec6cec5 100644
--- a/warehousing-system/project_web_ui/src/views/component/initial_value/add/productAdd.vue
+++ b/warehousing-system/project_web_ui/src/views/component/initial_value/add/productAdd.vue
@@ -6,7 +6,7 @@
         <div>{{ viewTitle }}</div>
         <!-- start 添加修改按钮 -->
         <div>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+          <el-button type="primary" size="small" @click="saveOrUpdate">保存</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
         <!-- end 添加修改按钮 -->
diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/add/supplierAdd.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/add/supplierAdd.vue
new file mode 100644
index 00000000..7d0635dc
--- /dev/null
+++ b/warehousing-system/project_web_ui/src/views/component/initial_value/add/supplierAdd.vue
@@ -0,0 +1,170 @@
+<template>
+    <div>
+  
+      <div class="tab-header webtop">
+        <!-- 标题 -->
+        <div>{{ viewTitle }}</div>
+        <!-- start 添加修改按钮 -->
+        <div>
+          <el-button type="primary" size="small" @click="saveOrUpdate">保存</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+        <!-- end 添加修改按钮 -->
+        <!-- end 详情按钮 -->
+      </div>
+      <div class="listconadd">
+  
+        <el-card class="box-card">
+          <div class="item">
+            <span class="item_text">供应商名称：</span>
+            <el-input v-model="locationForm.name"  placeholder="" class="item_input" clearable />
+          </div>
+          <div class="item">
+            <span class="item_text">联系人：</span>
+            <el-input v-model="locationForm.contacts" placeholder="" class="item_input" clearable />
+          </div>
+          <div class="item">
+            <span class="item_text">电话：</span>
+            <el-input v-model="locationForm.number" class="item_input" clearable></el-input>
+          </div>
+          <div class="item">
+            <span class="item_text">备    注：</span>
+            <el-input v-model="locationForm.remarks" class="item_input" clearable></el-input>
+          </div>
+        </el-card>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+    export default {
+      data() {
+        return {
+          locationForm: {
+            name: '',
+            contacts: '',
+            number: '',
+            remarks: ''
+          },
+          viewTitle: "【新增】供应商",
+        }
+      },
+      created() {
+
+      },
+      methods: {
+        saveOrUpdate() {
+         if (this.viewTitle === "【新增】供应商") return this.addProduct()
+         if (this.viewTitle === "【修改】供应商") {
+           this.updataProduct()
+        }
+  
+        },
+        handleReturn(isreload) {
+          if (isreload === 'true') this.$emit('reloadlist')
+          this.clearList()
+          this.$emit('doback')
+        },
+  
+        showAdd() {
+         this.viewTitle = "【新增】供应商";
+         this.disabledCode=false
+         this.clearList()
+        },
+        clearList(){
+        this.locationForm = {
+            name: '',
+            contacts: '',
+            number: '',
+            remarks: ''
+          }
+        },
+        showEdit(row) {
+          this.viewTitle = "【修改】供应商";
+          this.locationForm=row
+        },
+        async updataProduct () {
+          const { data: result } = await this.$http.put('/supplier/updataSupplier', this.locationForm)
+          if (result.status !== 200) return this.$message.error('修改供应商失败')
+          this.$message.success('更新成功')
+          this.handleReturn('true')
+        },
+        async addProduct () {
+          const { data: result } = await this.$http.post('/supplier/addSupplier', this.locationForm)
+          if (result.status !== 200) return this.$message.error('添加供应商失败')
+          this.$message.success('成功添加供应商')
+          this.handleReturn('true')
+         },
+     }
+    }
+  </script>
+  <style lang="scss">
+    .box-card {
+      margin-left: 60px;
+      margin-right: 60px;
+      min-width: 70%;
+      margin-top: 20px;
+  
+      .item {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        margin-top: 15px;
+        height: 40px;
+        line-height: 40px;
+  
+        .item_text {
+          flex: 0.8;
+          font-size: 18px;
+          text-align: right;
+        }
+  
+        .item_input {
+          flex: 4;
+          font-size: 16px;
+          margin-left: 10px;
+          margin-right: 80px;
+        }
+        .item_inputs {
+          flex: 4;
+          font-size: 16px;
+          margin-left: 10px;
+          margin-right: 28px;
+        }
+  
+        .item_left_input {
+          width: 20%;
+        }
+  
+        .item_left_text {
+          height: 30px;
+          margin-left: 20px;
+          line-height: 30px;
+          color: #018AD2;
+          padding: 0px 15px;
+          border: 1.5px solid #018AD2;
+          border-radius: 5px;
+  
+        }
+  
+        .item_right {
+          flex: 1;
+          justify-items: center;
+  
+          .item_right_list_text {
+            font-size: 16px;
+          }
+  
+          .item_right_list_delect {
+            color: #5E94FF;
+            margin-left: 20px;
+            font-size: 16px;
+            text-decoration: underline;
+          }
+        }
+  
+      }
+  
+    }
+  </style>
+  
\ No newline at end of file
diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/location.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/location.vue
index 162cf965..156d7967 100644
--- a/warehousing-system/project_web_ui/src/views/component/initial_value/location.vue
+++ b/warehousing-system/project_web_ui/src/views/component/initial_value/location.vue
@@ -59,15 +59,15 @@
           </el-table-column>
         </el-table>
         <div class="pages">
-       <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="queryInfo.pageNum"
-              :page-sizes="[10, 20, 30, 40]"
-              :page-size="queryInfo.pageSize"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="total">
-        </el-pagination>
+        <div class="tit" />
+         <pagination
+				   	v-show="locationList.length > 0"
+             :total="total"
+				   	:page.sync="queryInfo.pageNum"
+				   	:limit.sync="queryInfo.pageSize"
+				   	class="pagination"
+				   	@pagination="getLocationList"
+				  />
       </div>
       </div>
       </div>
@@ -163,6 +163,7 @@ export default {
 		},
     dosearch() {
 			this.queryInfo.pageNum = 1
+      this.total=0
 			this.getLocationList()
 		},
     resetQuery() {
diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/product.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/product.vue
index 283a87d2..f1740eab 100644
--- a/warehousing-system/project_web_ui/src/views/component/initial_value/product.vue
+++ b/warehousing-system/project_web_ui/src/views/component/initial_value/product.vue
@@ -17,10 +17,6 @@
               </div>
             </div>
          </div>
-         <div class="listtop">
-            <div class="tit">产品管理列表</div>
-            <pageye v-show="productList.length > 0" :total="queryInfo.total" :page.sync="queryInfo.pageNum" :limit.sync="queryInfo.pageSize" class="pagination" @pagination="getProductList" />
-          </div>
       <el-table :data="productList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
       style="width: 100%"
        border >
@@ -93,18 +89,9 @@
         </el-table>
         <div class="pages">
           <div class="tit" />
-         <!-- <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="queryInfo.pageNum"
-              :page-sizes="[10, 20, 30, 40]"
-              :page-size="queryInfo.pageSize"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="total">
-        </el-pagination> -->
         <pagination
 					v-show="productList.length > 0"
-          :total="queryInfo.total"
+          :total="total"
 					:page.sync="queryInfo.pageNum"
 					:limit.sync="queryInfo.pageSize"
 					class="pagination"
@@ -138,7 +125,6 @@ export default {
         query: '',
         pageNum: 1,
         pageSize: 10,
-        total:0
       },
       total: 0,
       productList: [],
@@ -232,6 +218,7 @@ export default {
     },
     dosearch() {
 			this.queryInfo.pageNum = 1
+      this.total =0
 			this.getProductList()
 		},
     resetQuery() {
@@ -242,7 +229,7 @@ export default {
       const { data: result } = await this.$http.get('/product/list', { params: this.queryInfo })
       if (result.status !== 200) return this.$message.error('获取列表失败')
 
-      this.queryInfo.total = result.data.total
+      this.total = result.data.total
       this.productList = result.data.rows
     },
 
diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/storehouse.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/storehouse.vue
index 82082471..09b54a53 100644
--- a/warehousing-system/project_web_ui/src/views/component/initial_value/storehouse.vue
+++ b/warehousing-system/project_web_ui/src/views/component/initial_value/storehouse.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-    <button-bar ref="btnbar" view-title="产品管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+    <button-bar ref="btnbar" view-title="仓库管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
       <div class="main-content">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
@@ -83,16 +83,6 @@
       </el-table>
       <div class="pages">
         <div class="tit" />
-      <!-- <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="queryInfo.current"
-        :page-sizes="[10, 20, 30, 40]"
-        :page-size="queryInfo.size"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      >
-      </el-pagination> -->
       <pagination
 					v-show="storehouseList.length > 0"
           :total="queryInfo.total"
@@ -199,13 +189,15 @@ export default {
       this.getStorehouseList();
     },
     handleCurrentChange(val) {
+      console.log(val);
       this.queryInfo.current = val;
       this.getStorehouseList();
     },
     async getStorehouseList() {
+      console.log(this.queryInfo);
       const { data: result } = await this.$http.post(
         "/v1/shstorehouse/listPage",
-        { params: this.queryInfo }
+        this.queryInfo 
       );
       if (result.code == 200) this.total = result.data.total;
       this.storehouseList = result.data.records;
diff --git a/warehousing-system/project_web_ui/src/views/component/initial_value/supplier.vue b/warehousing-system/project_web_ui/src/views/component/initial_value/supplier.vue
index 5e0213b3..501a1447 100644
--- a/warehousing-system/project_web_ui/src/views/component/initial_value/supplier.vue
+++ b/warehousing-system/project_web_ui/src/views/component/initial_value/supplier.vue
@@ -54,42 +54,19 @@
           </el-table-column>
         </el-table>
         <div class="pages">
-       <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="queryInfo.pageNum"
-              :page-sizes="[10, 20, 30, 40]"
-              :page-size="queryInfo.pageSize"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="total">
-        </el-pagination>
+        <div class="tit" />
+         <pagination
+				   	v-show="supplierList.length > 0"
+             :total="total"
+				   	:page.sync="queryInfo.pageNum"
+				   	:limit.sync="queryInfo.pageSize"
+				   	class="pagination"
+				   	@pagination="getSupplierList"
+				  />
       </div>
      </div>
      </div>
-
-      <el-dialog :title="title" :visible.sync="supplierDialogVisible" width="65%" @close="closeSupplierDialog">
-
-        <el-form :model="supplierForm" :rules="rules" ref="supplierRuleForm" label-width="100px" class="demo-ruleForm">
-          <el-form-item label="供应商名称" prop="name">
-            <el-input v-model="supplierForm.name" ></el-input>
-          </el-form-item>
-          <el-form-item label="联系人" prop="contacts">
-            <el-input v-model="supplierForm.contacts" ></el-input>
-          </el-form-item>
-          <el-form-item label="电话" prop="number">
-            <el-input v-model="supplierForm.number" ></el-input>
-          </el-form-item>
-          <el-form-item label="备    注" prop="remarks">
-            <el-input v-model="supplierForm.remarks" ></el-input>
-          </el-form-item>
-        </el-form>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="supplierDialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="operationSupplier">确 定</el-button>
-        </div>
-      </el-dialog>
-
+      <divadd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="getSupplierList" />
   </div>
 </template>
 
@@ -97,11 +74,13 @@
 import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
+import divadd from '@/views/component/initial_value/add/supplierAdd.vue'
 export default {
   components: {
 		ButtonBar,
 		Pagination,
 		pageye,
+    divadd
 	},
   data () {
     const checkPhone = (rule, value, callback) => {
@@ -206,42 +185,9 @@ export default {
       this.total = result.data.total
       this.supplierList = result.data.rows
     },
-    closeSupplierDialog () {
-      this.$refs.supplierRuleForm.resetFields()
-    },
-    addSupplierDialog () {
-      this.title = '新增供应商'
-      this.supplierDialogVisible = true
-    },
-    updataSupplierdialog (supplier) {
-      this.supplierForm.name = supplier.name
-      this.supplierForm.contacts = supplier.contacts
-      this.supplierForm.number = supplier.number
-      this.supplierForm.remarks = supplier.remarks
-      this.title = '修改供应商'
-      this.supplierDialogVisible = true
-    },
-    addSupplier () {
-      this.$refs.supplierRuleForm.validate(async valid => {
-        const { data: result } = await this.$http.post('/supplier/addSupplier', this.supplierForm)
-        if (result.status !== 200) return this.$message.error('添加供应商失败')
-        this.$message.success('成功添加供应商')
-        this.getSupplierList()
-        this.supplierDialogVisible = false
-      })
-    },
-    async updataSupplier () {
-      const { data: result } = await this.$http.put('/supplier/updataSupplier', this.supplierForm)
-      if (result.status !== 200) return this.$message.error('修改供应商失败')
-      this.$message.success('更新成功')
-      this.getSupplierList()
-      this.supplierDialogVisible = false
-    },
-    operationSupplier () {
-      if (this.title === '新增供应商') return this.addSupplier()
-      if (this.title === '修改供应商') {
-        this.updataSupplier()
-      }
+    updataSupplierdialog (row) {
+      this.viewState = 3
+	  	this.$refs['divadd'].showEdit(row)
     },
     async deleteSupplier (supplier) {
       const result = await this.$confirm('此操作将永久删除' + supplier.name + ', 是否继续?', '提示', {
@@ -257,7 +203,7 @@ export default {
     },
     toAdd() {
 			this.viewState = 2
-			// this.$refs['divadd'].showAdd()
+			this.$refs['divadd'].showAdd()
 		},
     doClose() {
         this.$store.dispatch('tagsView/delView', this.$route)
diff --git a/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue b/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue
new file mode 100644
index 00000000..f758638a
--- /dev/null
+++ b/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue
@@ -0,0 +1,476 @@
+<template>
+    <div>
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" @click="saveOrUpdate"
+            >保存</el-button
+          >
+          <el-button type="info" size="small" @click="handleReturn()"
+            >返回</el-button
+          >
+        </div>
+      </div>
+      <div class="listconadd">
+        <el-form ref="dataForm" :model="purchaseForm" label-position="top" label-width="190px" class="formadd">
+          <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+            <div style="margin-left: 15px;">主体信息</div>
+          </div>
+          <el-row>
+            <el-col :span="3" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">订单日期：</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item class="trightb_item">
+                <!-- <span>{{temp.bankName}}</span> -->
+                <el-date-picker v-model="purchaseForm.purchaseDate" type="date" style="width: 100%;"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">订单编号：</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item class="trightb_item" prop="purchaseNo">
+             <el-input :disabled="true" v-model="purchaseForm.purchaseNo"></el-input>
+           </el-form-item>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">供货商名称：</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+            <el-form-item prop="supplier" class="trightb_item">
+             <el-select v-model="purchaseForm.supplierName" placeholder="请选择"  >
+                 <el-option
+                   v-for="(supplier,i) in supplierList"
+                   :key="i"
+                   :label="supplier.name"
+                   :value="supplier.name">
+                 </el-option>
+             </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">采购申请人：</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item class="trightb_item">
+                <el-input v-model="purchaseForm.purchasePerson" placeholder="采购申请人" clearable />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="3" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">客户名称：</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" class="trightb">
+              <el-form-item class="trightb_item">
+                <el-select v-model="purchaseForm.custName" placeholder="请选择"  >
+                 <el-option
+                   v-for="(custName,i) in custList"
+                   :key="i"
+                   :label="custName.enterpriseName"
+                   :value="custName.enterpriseName">
+                 </el-option>
+               </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="3" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">仓库名称：</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+            <el-form-item class="trightb_item">
+             <el-select v-model="purchaseForm.storehouseName" placeholder="请选择"  >
+                 <el-option
+                   v-for="(storehouse,i) in storehouseList"
+                   :key="i"
+                   :label="storehouse.name"
+                   :value="storehouse.name">
+                 </el-option>
+               </el-select>
+             </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-collapse v-model="activeNames">
+            <el-collapse-item name="1">
+              <template slot="title" >
+                <span style="margin-left: 15px;">商品信息</span><span class="span" @click.stop="add()">添加</span>
+              </template>
+              <el-table  :data="purchaseForm.products" border style="width: 100%;"
+                :row-style="{height: '40px'}">
+                <!-- <el-table-column type="selection" align="center" width="50"/> -->
+                <el-table-column label="序号" type="index" width="60"  align="center" />
+                <el-table-column label="商品名称" width="120" prop="proName" align="center">
+                  <template slot-scope="scope">
+                     <el-select v-model="scope.row.proName" placeholder="请选择"  >
+                         <el-option
+                           v-for="product in productList"
+                           :key="product.name"
+                           :label="product.name"
+                           :value="product.name">
+                         </el-option>
+                     </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column label="商品品类" width="120" prop="productTypeName" align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.productTypeName" placeholder="商品品类" clearable></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="商品品牌" width="120" prop="brandInfoName" align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.brandInfoName" placeholder="商品品牌" clearable></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="规格（型号）" width="150" prop="proModel" align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.proModel" placeholder="" clearable></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="单价" width="140" prop="estimateConfirmedPrice" align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.estimateConfirmedPrice" @input="limitInput1($event,scope.$index)" placeholder="" clearable></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="数量" width="100"  prop="estimateNum" align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.estimateNum" @input="limitInput2($event,scope.$index)" placeholder="" clearable></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="总价值" width="120px" prop="estimateCalculatedValue" align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.estimateCalculatedValue" @input="limitInput3($event,scope.$index)" :readonly="true"  placeholder="" clearable></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="规格单位" width="130" prop="proUnit" align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.proUnit" placeholder="" clearable></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="生成厂家" width="150" prop="manufacturer" align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.manufacturer" placeholder="" clearable></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="实际数量" width="100px" prop="realityNum" align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.realityNum" placeholder="" clearable></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="实际重量" width="100px" prop="realityWeight" align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.realityWeight" placeholder="" clearable></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="实际质权人确认的单价" width="150px"  prop="realityConfirmedPrice" align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.realityConfirmedPrice" placeholder="" clearable></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="实际核算的价值" width="150px" prop="realityCalculatedValue" align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.realityCalculatedValue" placeholder="" clearable></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="货位号" width="150px" prop="locationNumber" align="center">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.locationNumber" placeholder="" clearable></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" align="center" width="150">
+                  <template slot-scope="scope">
+                    <el-button type="primary" size="mini" @click="doCommoditylDel(scope.$index)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+
+            </el-collapse-item>
+          </el-collapse>
+        </el-form>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+
+  export default {
+    name: "storehouseAdd",
+    components: {
+
+      },
+    data() {
+      return {
+        viewTitle: "【新增】采购订单",
+        purchaseForm: {
+           purchaseId: '',
+           product: '',
+           barCode: '',
+           purchaseDate:'',
+           purchaseNo:'',
+           supplier: '',
+           storehouseName:'',
+           supplierName:'',
+           count: '',
+           storehouse: '',
+           status: '',
+           products:[]
+        },
+        supplierList: [],
+        storehouseList: [],
+        productList: [],
+        productList2: [],
+        supplierList: [],
+        custList: [],
+        selectPurchaseList: [],
+        activeNames: ['1'],
+        rules: {
+        product: [
+          { required: true, message: '请输入商品名', trigger: 'blur' }
+        ],
+        supplier: [
+          { required: true, message: '请输入供应商', trigger: 'blur' }
+        ],
+        count: [
+          { required: true, message: '请输入商品数量', trigger: 'blur' }
+        ],
+        storehouse: [
+          { required: true, message: '请输入所属仓库', trigger: 'blur' }
+        ]
+      }
+      };
+    },
+    mounted() {
+
+    },
+    created() {
+        this.getProductList()
+        this.getSupplierList()
+        this.getStorehouseList()
+        this.getcustListList()
+        this.openAddPurchaseDialog()
+    },
+    methods: {
+      handleReturn(isreload) {
+        if (isreload === "true") this.$emit("reloadlist");
+        this.clearList()
+        this.$emit("doback");
+      },
+      clearList() {
+        this.purchaseForm={
+         purchaseId: '',
+         product: '',
+         barCode: '',
+         purchaseDate:'',
+         purchaseNo:'',
+         supplier: '',
+         storehouseName:'',
+         supplierName:'',
+         count: '',
+         storehouse: '',
+         status: '',
+         products:[]
+               
+         }
+      },
+      saveOrUpdate(){
+        if (this.viewTitle === "【新增】采购订单") return this.addStorehouse();
+        if (this.viewTitle === "【修改】采购订单") {
+          this.addStorehouse();
+        }
+      },
+      showAdd() {
+        this.viewTitle = "【新增】采购订单";
+        this.clearList()
+      },
+      async showEdit(row) {
+        this.viewTitle = "【修改】采购订单";
+        const _this = this
+        const { data: result } = await this.$http.get(`/purchasenew/fetchDetailsBySid/${row.sid}`)
+        if (result.code==200) {
+          _this.purchaseForm=result.data
+      }
+      },
+      addStorehouse(){
+        this.$refs.dataForm.validate(async validate => {
+        if (!validate) return this.$message.error('请填写必填项')
+        this.purchaseForm.status = '待审核'
+        const { data: result } = await this.$http.post('/purchasenew/save', this.purchaseForm)
+        if (result.code == 200) {
+          this.$message({ type: 'success', message: result.msg, showClose: true })
+          this.handleReturn('true')
+          this.clearList()
+        }
+       })
+      },
+      async getSupplierList () {
+         const { data: result } = await this.$http.get('/purchase/getSupplier')
+         if (result.status !== 200) return this.$message.error('获取列表失败')
+         this.supplierList = result.data
+      },
+      async getStorehouseList () {
+      const { data: result } = await this.$http.get("/v1/shstorehouse/listAll")
+      if (result.code == 200){
+        this.storehouseList = result.data
+      }
+      },
+      async getProductList () {
+      const { data: result } = await this.$http.get('/purchase/getProductList', { params: { name: this.purchaseForm.product } })
+      if (result.status !== 200) return this.$message.error('获取商品列表失败')
+      this.productList = result.data
+      this.purchaseForm.barCode = this.productList[0].barCode
+    },
+    async getcustListList () {
+      const { data: result } = await this.$http.get('/v1/shstorehouse/fetchEntList')
+      if (result.code == 200){
+        this.custList = result.data
+      }
+    },
+    openAddPurchaseDialog () {
+      this.clearList()
+      var now = new Date()
+      this.purchaseForm.purchaseNo = 'IP' + now.getTime()
+      if (this.productList2.length == 0) this.productList2 = this.productList
+      this.add()
+     },
+      add(){
+      this.purchaseForm.products.push({
+
+      })
+     },
+     doCommoditylDel(index) {
+
+       const tip = '请确认是否删除所选记录?'
+         this.$confirm(tip, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+             this.purchaseForm.products.splice(index, 1);
+        })
+       },
+      getLists(){
+        let arrList=this.purchaseForm.products
+        for(let i=0;i<arrList.length;i++){
+          if(arrList[i].estimateNum &&  arrList[i].estimateConfirmedPrice){
+            let newValue=parseFloat(arrList[i].estimateNum) * parseFloat(arrList[i].estimateConfirmedPrice) || 0
+            this.$set(arrList[i], 'estimateCalculatedValue', newValue)
+          }else{
+            this.$set(arrList[i], 'estimateCalculatedValue', '')
+          }
+        }
+       },
+       limitInput1(value, index) {
+        this.purchaseForm.products[index].estimateConfirmedPrice =
+          ("" + value) // 第一步：转成字符串
+          .replace(/[^\d^\.]+/g, "") // 第二步：把不是数字，不是小数点的过滤掉
+          .replace(/^0+(\d)/, "$1") // 第三步：第一位0开头，0后面为数字，则过滤掉，取后面的数字
+          .replace(/^\./, "0.") // 第四步：如果输入的第一位为小数点，则替换成 0. 实现自动补全
+          .match(/^\d*(\.?\d{0,2})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数
+          this.getLists()
+      },
+      limitInput2(value, index) {
+        this.purchaseForm.products[index].estimateNum =
+          ("" + value) // 第一步：转成字符串
+          .replace(/[^\d^\.]+/g, "") // 第二步：把不是数字，不是小数点的过滤掉
+          .replace(/^0+(\d)/, "$1") // 第三步：第一位0开头，0后面为数字，则过滤掉，取后面的数字
+          .replace(/^\./, "0.") // 第四步：如果输入的第一位为小数点，则替换成 0. 实现自动补全
+          .match(/^\d*(\.?\d{0,2})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数
+          this.getLists()
+      },
+      limitInput3(value, index) {
+        this.purchaseForm.products[index].estimateCalculatedValue =
+          ("" + value) // 第一步：转成字符串
+          .replace(/[^\d^\.]+/g, "") // 第二步：把不是数字，不是小数点的过滤掉
+          .replace(/^0+(\d)/, "$1") // 第三步：第一位0开头，0后面为数字，则过滤掉，取后面的数字
+          .replace(/^\./, "0.") // 第四步：如果输入的第一位为小数点，则替换成 0. 实现自动补全
+          .match(/^\d*(\.?\d{0,2})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数
+          this.getLists()
+      },
+    },
+  };
+  </script>
+  
+  <style scoped>
+  /deep/ .el-collapse-item__header {
+      height: 40px;
+      font-weight: bold;
+      font-size: 16px;
+      text-align: left;
+      color: #ffffff;
+      background-color: #0294d7;
+    }
+  
+    /deep/ .el-collapse-item__content {
+      padding-bottom: 0;
+    }
+    .trightb {
+      display: flex;
+      align-items: center;
+      text-align: center;
+      justify-content: center;
+    }
+  
+    .trightb_item {
+      padding-top: 5px;
+    }
+  
+    .span {
+      margin-left: 50px;
+      font-size: 15px;
+      font-weight: 400;
+    }
+    .formadd {
+      padding: 10px 40px 0 40px;
+      font-size: 16px;
+    }
+    .formadd .title {
+      font-weight: bold;
+      font-size: 16px;
+      background-color: #0294d7;
+      text-align: left;
+      color: #ffffff;
+    }
+    .first_row{
+      border-top: 1px solid #e0e3eb;
+    }
+    .formadd .el-row {
+      display: flex;
+      flex-wrap: wrap;
+      border-left: 1px solid #e0e3eb;
+    }
+    .formadd  .el-row .el-col {
+       border-right: 1px solid #e0e3eb;
+       border-bottom: 1px solid #e0e3eb;
+       padding: 0 15px;
+       min-height: 42px;
+       line-height: 1;
+    }
+    .formadd  .el-row .el-col .el-form-item {
+      margin-bottom: 0;
+      line-height: 42px;
+    }
+    .addinputw {
+      width: 80%;
+      line-height: 42px;
+    }
+   .el-input__inner {
+     height: 36px;
+    }
+  </style>
+  
+  
\ No newline at end of file
diff --git a/warehousing-system/project_web_ui/src/views/component/instorehouse/purchase.vue b/warehousing-system/project_web_ui/src/views/component/instorehouse/purchase.vue
index 0b3633c3..c99fa787 100644
--- a/warehousing-system/project_web_ui/src/views/component/instorehouse/purchase.vue
+++ b/warehousing-system/project_web_ui/src/views/component/instorehouse/purchase.vue
@@ -25,36 +25,43 @@
         <el-table-column
           prop="custName"
           label="客户名称"
+          align="center"
           width="180">
         </el-table-column>
         <el-table-column
           prop="purchaseNo"
           label="订单编号"
+          align="center"
           width="180">
         </el-table-column>
         <el-table-column
           prop="purchaseDate"
           label="订单日期"
+          align="center"
           width="180">
         </el-table-column>
         <el-table-column
           prop="supplierName"
           label="供应商名称"
+          align="center"
           width="180">
         </el-table-column>
         <el-table-column
           prop="purchasePerson"
           label="采购申请人"
+          align="center"
           width="180">
         </el-table-column>
         <el-table-column
           prop="storehouseName"
           label="仓库名称"
+          align="center"
           width="180">
         </el-table-column>
         <el-table-column
           prop="status"
           label="状态"
+          align="center"
           width="180">
         </el-table-column>
         <el-table-column
@@ -70,221 +77,20 @@
         </el-table-column>
       </el-table>
       <div class="pages">
-     <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="queryInfo.current"
-            :page-sizes="[10, 20, 30, 40]"
-            :page-size="queryInfo.size"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total">
-      </el-pagination>
+        <div class="tit" />
+      <pagination
+					v-show="purchaseList.length > 0"
+          :total="queryInfo.total"
+					:page.sync="queryInfo.current"
+					:limit.sync="queryInfo.size"
+					class="pagination"
+					@pagination="getPurchaseList"
+				/>
     </div>
     </div>
     </div>
 
-
-     <el-dialog title="添加采购订单" :visible.sync="addPurchaseDialogVisible" width="75%">
-
-      <div class="listconadd">
-        <el-form ref="dataForm" :model="purchaseForm" label-position="top" label-width="190px" class="formadd">
-          <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
-            <div style="margin-left: 15px;">主体信息</div>
-          </div>
-          <el-row>
-            <el-col :span="3" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">订单日期：</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span>{{temp.bankName}}</span> -->
-                <el-date-picker v-model="purchaseForm.purchaseDate" type="date" style="width: 100%;"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="3" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">订单编号：</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item class="trightb_item" prop="purchaseNo">
-             <el-input :disabled="true" v-model="purchaseForm.purchaseNo"></el-input>
-           </el-form-item>
-            </el-col>
-            <el-col :span="3" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">供货商名称：</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">
-            <el-form-item prop="supplier" class="trightb_item">
-             <el-select v-model="purchaseForm.supplierName" placeholder="请选择"  >
-                 <el-option
-                   v-for="(supplier,i) in supplierList"
-                   :key="i"
-                   :label="supplier.name"
-                   :value="supplier.name">
-                 </el-option>
-             </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="3" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">采购申请人：</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <el-input v-model="purchaseForm.purchasePerson" placeholder="采购申请人" clearable />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="3" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">客户名称：</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6" class="trightb">
-              <el-form-item class="trightb_item">
-                <el-select v-model="purchaseForm.custName" placeholder="请选择"  >
-                 <el-option
-                   v-for="(custName,i) in custList"
-                   :key="i"
-                   :label="custName.enterpriseName"
-                   :value="custName.sid">
-                 </el-option>
-               </el-select>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="3" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">仓库名称：</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">
-            <el-form-item class="trightb_item">
-             <el-select v-model="purchaseForm.storehouseName" placeholder="请选择"  >
-                 <el-option
-                   v-for="(storehouse,i) in storehouseList"
-                   :key="i"
-                   :label="storehouse.name"
-                   :value="storehouse.name">
-                 </el-option>
-               </el-select>
-             </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-collapse v-model="activeNames">
-            <el-collapse-item name="1">
-              <template slot="title" >
-                <span style="margin-left: 15px;">商品信息</span><span class="span" @click.stop="add()">添加</span>
-              </template>
-              <el-table  :data="purchaseForm.products" border style="width: 100%;"
-                :row-style="{height: '40px'}">
-                <!-- <el-table-column type="selection" align="center" width="50"/> -->
-                <el-table-column label="序号" type="index" width="60"  align="center" />
-                <el-table-column label="商品名称" width="120" prop="proName" align="center">
-                  <template slot-scope="scope">
-                     <el-select v-model="scope.row.proName" placeholder="请选择"  >
-                         <el-option
-                           v-for="product in productList"
-                           :key="product.name"
-                           :label="product.name"
-                           :value="product.name">
-                         </el-option>
-                     </el-select>
-                    </template>
-                </el-table-column>
-                <el-table-column label="商品品类" width="120" prop="productTypeName" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.productTypeName" placeholder="商品品类" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="商品品牌" width="120" prop="brandInfoName" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.brandInfoName" placeholder="商品品牌" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="规格（型号）" width="150" prop="proModel" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.proModel" placeholder="" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="单价" width="140" prop="estimateConfirmedPrice" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.estimateConfirmedPrice" @input="limitInput1($event,scope.$index)" placeholder="" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="数量" width="100"  prop="estimateNum" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.estimateNum" @input="limitInput2($event,scope.$index)" placeholder="" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="总价值" width="120px" prop="estimateCalculatedValue" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.estimateCalculatedValue" @input="limitInput3($event,scope.$index)" :readonly="true"  placeholder="" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="规格单位" width="130" prop="proUnit" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.proUnit" placeholder="" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="生成厂家" width="150" prop="manufacturer" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.manufacturer" placeholder="" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="实际数量" width="100px" prop="realityNum" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.realityNum" placeholder="" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="实际重量" width="100px" prop="realityWeight" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.realityWeight" placeholder="" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="实际质权人确认的单价" width="150px"  prop="realityConfirmedPrice" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.realityConfirmedPrice" placeholder="" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="实际核算的价值" width="150px" prop="realityCalculatedValue" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.realityCalculatedValue" placeholder="" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="货位号" width="150px" prop="locationNumber" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.locationNumber" placeholder="" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" fixed="right" align="center" width="150">
-                  <template slot-scope="scope">
-                    <el-button type="primary" size="mini" @click="doCommoditylDel(scope.$index)">删除</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-
-            </el-collapse-item>
-          </el-collapse>
-        </el-form>
-
-      </div>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="addPurchaseDialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="addPurchase">确 定</el-button>
-        </div>
-      </el-dialog>
+      <divadd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="getPurchaseList" />
   </div>
 
 </template>
@@ -293,11 +99,13 @@
 import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
+import divadd from '@/views/component/instorehouse/add/purchaseAdd.vue'
 export default {
   components: {
 		ButtonBar,
 		Pagination,
 		pageye,
+    divadd
 	},
   data () {
     return {
@@ -328,21 +136,8 @@ export default {
            btnLabel: '关闭'
          }
        ],
-      queryInfoz: {
-        total: 0,
-        current: 10,
-        size: 100,
-      },
       total: 0,
       purchaseList: [],
-      activeNames: ['1'],
-      addPurchaseDialogVisible: false,
-      updataPurchaseDialogVisible: false,
-      productList: [],
-      productList2: [],
-      supplierList: [],
-      storehouseList: [],
-      custList: [],
       selectPurchaseList: [],
       purchaseForm: {
         purchaseId: '',
@@ -360,20 +155,6 @@ export default {
       },
       pirce:'',
       num:'',
-      rules: {
-        product: [
-          { required: true, message: '请输入商品名', trigger: 'blur' }
-        ],
-        supplier: [
-          { required: true, message: '请输入供应商', trigger: 'blur' }
-        ],
-        count: [
-          { required: true, message: '请输入商品数量', trigger: 'blur' }
-        ],
-        storehouse: [
-          { required: true, message: '请输入所属仓库', trigger: 'blur' }
-        ]
-      }
     }
   },
   created(){
@@ -405,15 +186,6 @@ export default {
       },
 			this.getPurchaseList()
 		},
-    handleSizeChange (val) {
-      this.queryInfo.size = val
-      this.getPurchaseList()
-    },
-
-    handleCurrentChange (val) {
-      this.queryInfo.current = val
-      this.getPurchaseList()
-    },
     // 序号
     indexMethod(index) {
         var pagestart = (this.queryInfo.current - 1) * this.queryInfo.size
@@ -421,33 +193,12 @@ export default {
         return pageindex
       },
     async getPurchaseList () {
-      const { data: result } = await this.$http.post('/purchasenew/listPage', { params: this.queryInfo })
+      const { data: result } = await this.$http.post('/purchasenew/listPage', this.queryInfo)
       if (result.code == 200){
-        this.total = result.data.total
+        this.queryInfo.total=result.data.total
         this.purchaseList = result.data.records
-        // this.$message({ type: 'success', message: result.msg, showClose: true })
-      }
-    },
-    async getcustListList () {
-      const { data: result } = await this.$http.get('/v1/shstorehouse/fetchEntList')
-      if (result.code == 200){
-        this.custList = result.data
       }
     },
-
-    addPurchase () {
-      this.$refs.dataForm.validate(async validate => {
-        if (!validate) return this.$message.error('请填写必填项')
-        this.purchaseForm.status = '待审核'
-        const { data: result } = await this.$http.post('/purchasenew/save', this.purchaseForm)
-        if (result.code == 200) {
-          this.getPurchaseList()
-          this.addPurchaseDialogVisible = false
-          this.$message({ type: 'success', message: result.msg, showClose: true })
-          this.clearList()
-        }
-      })
-    },
     clearList(){
       this.purchaseForm={
          purchaseId: '',
@@ -465,44 +216,6 @@ export default {
                
          }
     },
-    async getProductList () {
-      const { data: result } = await this.$http.get('/purchase/getProductList', { params: { name: this.purchaseForm.product } })
-      if (result.status !== 200) return this.$message.error('获取商品列表失败')
-      this.productList = result.data
-      this.purchaseForm.barCode = this.productList[0].barCode
-    },
-
-    openAddPurchaseDialog () {
-      this.clearList()
-      this.addPurchaseDialogVisible = true
-      var now = new Date()
-      this.purchaseForm.purchaseNo = 'IP' + now.getTime()
-      console.log('IP' + now.getTime())
-      if (this.productList2.length == 0) this.productList2 = this.productList
-      this.add()
-    },
-
-    async getSupplierList () {
-      const { data: result } = await this.$http.get('/purchase/getSupplier')
-      if (result.status !== 200) return this.$message.error('获取列表失败')
-      this.supplierList = result.data
-    },
-
-    async getStorehouseList () {
-      const { data: result } = await this.$http.post("/v1/shstorehouse/listPage",{ params: this.queryInfoz })
-      if (result.code == 200){
-        this.storehouseList = result.data.records
-      }
-    },
-
-    closeUpdataPurchaseDialog () {
-      this.$refs.updataPurchaseRuleForm.resetFields()
-    },
-
-    closeAddPurchaseDialog () {
-      this.$refs.addPurchaseRuleForm.resetFields()
-    },
-
     async deletePurchase (purchase) {
       const sids = []
 			sids.push(purchase.sid)
@@ -518,124 +231,11 @@ export default {
       this.getPurchaseList()
     },
 
-    async open (purchase) {
-      // if (purchase.status !== '待审核') return this.$message.error('订单' + purchase.purchaseNo + '进行中')
-      this.addPurchaseDialogVisible = true
-      const _this = this
-      const { data: result } = await this.$http.get(`/purchasenew/fetchDetailsBySid/${purchase.sid}`)
-      if (result.code==200) {
-        _this.purchaseForm=result.data
-      }
-    },
-    checkUpdataPurchase () {
-      this.$refs.updataPurchaseRuleForm.validate(validate => {
-        if (!validate) return this.$message.error('请填写必填项')
-        this.updataPurchase(this.purchaseForm)
-        this.$message.success('订单修改成功')
-        this.updataPurchaseDialogVisible = false
-      })
-    },
-
-    async updataPurchase (purchase) {
-      const { data: result } = await this.$http.put('/purchase/updata', purchase)
-      if (result.status !== 200) return this.$message.error('修改订单失败')
-      this.getPurchaseList()
-    },
-
-    handleSelectionChange (val) {
-      this.selectPurchaseList = val
-    },
-
-    check () {
-      for (var i = 0; i < this.selectPurchaseList.length; i++) {
-        if (this.selectPurchaseList[i].status === '待审核') {
-          this.selectPurchaseList[i].status = '已审核'
-          this.updataPurchase(this.selectPurchaseList[i])
-          this.$message.success('订单' + this.selectPurchaseList[i].purchaseId + '审核成功')
-        } else if (this.selectPurchaseList[i].status === '已审核') {
-          this.$message.error('订单' + this.selectPurchaseList[i].purchaseId + '已审核')
-        } else {
-          this.$message.error('订单' + this.selectPurchaseList[i].purchaseId + '进行中')
-        }
-      }
-    },
-
-    cancel () {
-      for (var i = 0; i < this.selectPurchaseList.length; i++) {
-        if (this.selectPurchaseList[i].status === '已审核') {
-          this.selectPurchaseList[i].status = '待审核'
-          this.updataPurchase(this.selectPurchaseList[i])
-          this.$message.success('订单' + this.selectPurchaseList[i].purchaseNo + '撤销审核成功')
-        } else if (this.selectPurchaseList[i].status === '待审核') {
-          this.$message.error('订单' + this.selectPurchaseList[i].purchaseNo + '未审核')
-        } else {
-          this.$message.error('订单' + this.selectPurchaseList[i].purchaseNo + '进行中')
-        }
-      }
-    },
-    doCommoditylDel(){
-
+    async open (row) {
+      this.viewState = 3
+	  	this.$refs['divadd'].showEdit(row)
     },
-    add(){
-      this.purchaseForm.products.push({
 
-     })
-    },
-     // 序号
-     indexMethod(index) {
-        // var pagestart = (this.listQuery.current - 1) * this.listQuery.size
-        // var pageindex = index + 1 + pagestart
-        return index + 1
-      },
-      doCommoditylDel(index) {
-
-         const tip = '请确认是否删除所选记录?'
-           this.$confirm(tip, '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-               this.purchaseForm.products.splice(index, 1);
-          })
-         },
-       getLists(){
-        let arrList=this.purchaseForm.products
-        for(let i=0;i<arrList.length;i++){
-          if(arrList[i].estimateNum &&  arrList[i].estimateConfirmedPrice){
-            let newValue=parseFloat(arrList[i].estimateNum) * parseFloat(arrList[i].estimateConfirmedPrice) || 0
-            this.$set(arrList[i], 'estimateCalculatedValue', newValue)
-          }else{
-            this.$set(arrList[i], 'estimateCalculatedValue', '')
-          }
-        }
-       },
-       limitInput1(value, index) {
-        this.purchaseForm.products[index].estimateConfirmedPrice =
-          ("" + value) // 第一步：转成字符串
-          .replace(/[^\d^\.]+/g, "") // 第二步：把不是数字，不是小数点的过滤掉
-          .replace(/^0+(\d)/, "$1") // 第三步：第一位0开头，0后面为数字，则过滤掉，取后面的数字
-          .replace(/^\./, "0.") // 第四步：如果输入的第一位为小数点，则替换成 0. 实现自动补全
-          .match(/^\d*(\.?\d{0,2})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数
-          this.getLists()
-      },
-      limitInput2(value, index) {
-        this.purchaseForm.products[index].estimateNum =
-          ("" + value) // 第一步：转成字符串
-          .replace(/[^\d^\.]+/g, "") // 第二步：把不是数字，不是小数点的过滤掉
-          .replace(/^0+(\d)/, "$1") // 第三步：第一位0开头，0后面为数字，则过滤掉，取后面的数字
-          .replace(/^\./, "0.") // 第四步：如果输入的第一位为小数点，则替换成 0. 实现自动补全
-          .match(/^\d*(\.?\d{0,2})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数
-          this.getLists()
-      },
-      limitInput3(value, index) {
-        this.purchaseForm.products[index].estimateCalculatedValue =
-          ("" + value) // 第一步：转成字符串
-          .replace(/[^\d^\.]+/g, "") // 第二步：把不是数字，不是小数点的过滤掉
-          .replace(/^0+(\d)/, "$1") // 第三步：第一位0开头，0后面为数字，则过滤掉，取后面的数字
-          .replace(/^\./, "0.") // 第四步：如果输入的第一位为小数点，则替换成 0. 实现自动补全
-          .match(/^\d*(\.?\d{0,2})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数
-          this.getLists()
-      },
       toAdd() {
 			this.viewState = 2
 			// this.$refs['divadd'].showAdd()
@@ -649,78 +249,10 @@ export default {
   mounted () {
     this.$refs['btnbar'].setButtonList(this.btnList)
     this.getPurchaseList()
-    this.getProductList()
-    this.getSupplierList()
-    this.getStorehouseList()
-    this.getcustListList()
   }
 }
 </script>
 
 <style scoped>
-/deep/ .el-collapse-item__header {
-    height: 40px;
-    font-weight: bold;
-    font-size: 16px;
-    text-align: left;
-    color: #ffffff;
-    background-color: #0294d7;
-  }
-
-  /deep/ .el-collapse-item__content {
-    padding-bottom: 0;
-  }
-  .trightb {
-    display: flex;
-    align-items: center;
-    text-align: center;
-    justify-content: center;
-  }
-
-  .trightb_item {
-    padding-top: 5px;
-  }
 
-  .span {
-    margin-left: 50px;
-    font-size: 15px;
-    font-weight: 400;
-  }
-  .formadd {
-    padding: 10px 40px 0 40px;
-    font-size: 16px;
-  }
-  .formadd .title {
-    font-weight: bold;
-    font-size: 16px;
-    background-color: #0294d7;
-    text-align: left;
-    color: #ffffff;
-  }
-  .first_row{
-    border-top: 1px solid #e0e3eb;
-  }
-  .formadd .el-row {
-    display: flex;
-    flex-wrap: wrap;
-    border-left: 1px solid #e0e3eb;
-  }
-  .formadd  .el-row .el-col {
-     border-right: 1px solid #e0e3eb;
-     border-bottom: 1px solid #e0e3eb;
-     padding: 0 15px;
-     min-height: 42px;
-     line-height: 1;
-  }
-  .formadd  .el-row .el-col .el-form-item {
-    margin-bottom: 0;
-    line-height: 42px;
-  }
-  .addinputw {
-    width: 80%;
-    line-height: 42px;
-  }
- .el-input__inner {
-   height: 36px;
-  }
 </style>
diff --git a/warehousing-system/project_web_ui/src/views/component/instorehouse/putInList.vue b/warehousing-system/project_web_ui/src/views/component/instorehouse/putInList.vue
index 9ea04a87..933dea7a 100644
--- a/warehousing-system/project_web_ui/src/views/component/instorehouse/putInList.vue
+++ b/warehousing-system/project_web_ui/src/views/component/instorehouse/putInList.vue
@@ -84,15 +84,15 @@
         </el-table-column>
       </el-table>
       <div class="pages">
-     <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="queryInfo.pageNum"
-            :page-sizes="[10, 20, 30, 40]"
-            :page-size="queryInfo.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total">
-      </el-pagination>
+      <div class="tit" />
+        <pagination
+					v-show="inStorehouseList.length > 0"
+          :total="total"
+					:page.sync="queryInfo.pageNum"
+					:limit.sync="queryInfo.pageSize"
+					class="pagination"
+					@pagination="getInStorehouseList"
+				/>
     </div>
     </div>
     </el-card>
diff --git a/warehousing-system/project_web_ui/src/views/component/instorehouse/putInManagement.vue b/warehousing-system/project_web_ui/src/views/component/instorehouse/putInManagement.vue
index 3f5b6fb3..026933db 100644
--- a/warehousing-system/project_web_ui/src/views/component/instorehouse/putInManagement.vue
+++ b/warehousing-system/project_web_ui/src/views/component/instorehouse/putInManagement.vue
@@ -73,15 +73,15 @@
         </el-table-column>
       </el-table>
       <div class="pages">
-     <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="queryInfo.pageNum"
-            :page-sizes="[10, 20, 30, 40]"
-            :page-size="queryInfo.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total">
-      </el-pagination>
+      <div class="tit" />
+        <pagination
+					v-show="inStorehouseList.length > 0"
+          :total="total"
+					:page.sync="queryInfo.pageNum"
+					:limit.sync="queryInfo.pageSize"
+					class="pagination"
+					@pagination="getInStorehouseList"
+				/>
     </div>
     </div>
   </div>
diff --git a/warehousing-system/project_web_ui/src/views/component/instorehouse/receivingManagement.vue b/warehousing-system/project_web_ui/src/views/component/instorehouse/receivingManagement.vue
index 5b0f9cf9..19a4ba54 100644
--- a/warehousing-system/project_web_ui/src/views/component/instorehouse/receivingManagement.vue
+++ b/warehousing-system/project_web_ui/src/views/component/instorehouse/receivingManagement.vue
@@ -73,15 +73,15 @@
         </el-table-column>
       </el-table>
       <div class="pages">
-     <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="queryInfo.pageNum"
-            :page-sizes="[10, 20, 30, 40]"
-            :page-size="queryInfo.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total">
-      </el-pagination>
+      <div class="tit" />
+        <pagination
+					v-show="receivingList.length > 0"
+          :total="total"
+					:page.sync="queryInfo.pageNum"
+					:limit.sync="queryInfo.pageSize"
+					class="pagination"
+					@pagination="getReceiving"
+				/>
     </div>
     </div>
     </div>
diff --git a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue
index 7a381b42..4cc6c659 100644
--- a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue
+++ b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue
@@ -91,15 +91,15 @@
         </el-table-column>
        </el-table>
      <div class="pages">
-       <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="queryInfo.pageNum"
-              :page-sizes="[10, 20, 30, 40]"
-              :page-size="queryInfo.pageSize"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="total">
-        </el-pagination>
+        <div class="tit" />
+        <pagination
+					v-show="outStorehouseList.length > 0"
+          :total="total"
+					:page.sync="queryInfo.pageNum"
+					:limit.sync="queryInfo.pageSize"
+					class="pagination"
+					@pagination="getOutStorehouseList"
+				/>
       </div>
     </div>
     </div>
diff --git a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outStorehouseOrder.vue b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outStorehouseOrder.vue
index 35bcc117..7506f219 100644
--- a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outStorehouseOrder.vue
+++ b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outStorehouseOrder.vue
@@ -101,15 +101,15 @@
           </el-table-column>
         </el-table>
         <div class="pages">
-       <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="queryInfo.pageNum"
-              :page-sizes="[10, 20, 30, 40]"
-              :page-size="queryInfo.pageSize"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="total">
-        </el-pagination>
+        <div class="tit" />
+        <pagination
+					v-show="outStorehouseList.length > 0"
+          :total="total"
+					:page.sync="queryInfo.pageNum"
+					:limit.sync="queryInfo.pageSize"
+					class="pagination"
+					@pagination="getOutStorehouseList"
+				/>
       </div>
     </div>
       </el-card>
diff --git a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/pickingManagement.vue b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/pickingManagement.vue
index fe52c0e9..69f4778e 100644
--- a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/pickingManagement.vue
+++ b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/pickingManagement.vue
@@ -72,15 +72,15 @@
           </el-table-column>
         </el-table>
        <div class="pages">
-          <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="queryInfo.pageNum"
-              :page-sizes="[10, 20, 30, 40]"
-              :page-size="queryInfo.pageSize"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="total">
-          </el-pagination>
+         <div class="tit" />
+        <pagination
+					v-show="pickingList.length > 0"
+          :total="total"
+					:page.sync="queryInfo.pageNum"
+					:limit.sync="queryInfo.pageSize"
+					class="pagination"
+					@pagination="getPickingList"
+				/>
         </div>
       </div>
      </div>
diff --git a/warehousing-system/project_web_ui/src/views/component/pictureList/pictureList.vue b/warehousing-system/project_web_ui/src/views/component/pictureList/pictureList.vue
index 115038bc..0d61a783 100644
--- a/warehousing-system/project_web_ui/src/views/component/pictureList/pictureList.vue
+++ b/warehousing-system/project_web_ui/src/views/component/pictureList/pictureList.vue
@@ -77,7 +77,8 @@ export default {
   mounted() {
     this.$refs['btnbar'].setButtonList(this.btnList)
     this.getStorehouseList();
-    if(sid){
+    this.getImgSid();
+    if(this.sid!=''){
       this.LookStorehousedialog()
     }
   },
@@ -97,6 +98,17 @@ export default {
 					break
 			}
 		},
+    getImgSid(){
+      let str=window.location.href;
+      if(str.charAt(str.length - 1)!="t"){
+        var id= window.location.href.split("?")[1].split("=")[1];
+        this.sid=id
+      }
+      // if(window.location.href){
+
+      // }
+
+    },
     handleSizeChange(val) {
       this.queryInfo.size = val;
       this.getStorehouseList();
diff --git a/warehousing-system/project_web_ui/src/views/component/stockManagement/stockList.vue b/warehousing-system/project_web_ui/src/views/component/stockManagement/stockList.vue
index 65042a98..83ff6468 100644
--- a/warehousing-system/project_web_ui/src/views/component/stockManagement/stockList.vue
+++ b/warehousing-system/project_web_ui/src/views/component/stockManagement/stockList.vue
@@ -88,15 +88,15 @@
       </el-table-column>
       </el-table>
       <div class="pages">
-        <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="queryInfo.current"
-            :page-sizes="[10, 20, 30, 40]"
-            :page-size="queryInfo.size"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total">
-          </el-pagination>
+        <div class="tit" />
+        <pagination
+					v-show="stockList.length > 0"
+          :total="total"
+					:page.sync="queryInfo.current"
+					:limit.sync="queryInfo.size"
+					class="pagination"
+					@pagination="getStockList"
+				/>
         </div>
       </div>
     </div>
diff --git a/warehousing-system/project_web_ui/src/views/component/storehouseManage/remove.vue b/warehousing-system/project_web_ui/src/views/component/storehouseManage/remove.vue
index 0a97c309..1acca28d 100644
--- a/warehousing-system/project_web_ui/src/views/component/storehouseManage/remove.vue
+++ b/warehousing-system/project_web_ui/src/views/component/storehouseManage/remove.vue
@@ -107,9 +107,7 @@ export default {
       this.availableQuantity = result.data.availableQuantity
     },
 
-    addRemove () {
-      this.$refs.onRemoveRuleForm.validate(async validate => {
-        if (!validate) return this.$message.error('请输入必填项')
+    async addRemove () {
         if (this.remove.count === 0) return this.$message.error('商品数量为零')
         this.remove.status = '待审核'
         this.remove.createPerson = this.user
@@ -117,7 +115,6 @@ export default {
         const { data: result } = await this.$http.post('/remove/addRemove', this.remove)
         if (result.status === 201) return this.$message.error('添加失败')
         this.$refs.onRemoveRuleForm.resetFields()
-      })
     },
     doClose() {
         this.$store.dispatch('tagsView/delView', this.$route)
@@ -144,7 +141,7 @@ export default {
     position: relative;
     .btm{
       position: absolute;
-      top: 270px;
+      top: 200px;
       left: 70%;
     }
     .item {
diff --git a/warehousing-system/project_web_ui/src/views/component/storehouseManage/removeManagement.vue b/warehousing-system/project_web_ui/src/views/component/storehouseManage/removeManagement.vue
index 39638c22..3d7c79fb 100644
--- a/warehousing-system/project_web_ui/src/views/component/storehouseManage/removeManagement.vue
+++ b/warehousing-system/project_web_ui/src/views/component/storehouseManage/removeManagement.vue
@@ -83,15 +83,15 @@
         </el-table-column>
       </el-table>
       <div class="pages">
-        <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="queryInfo.pageNum"
-            :page-sizes="[10, 20, 30, 40]"
-            :page-size="queryInfo.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total">
-         </el-pagination>
+         <div class="tit" />
+        <pagination
+					v-show="removeList.length > 0"
+          :total="total"
+					:page.sync="queryInfo.pageNum"
+					:limit.sync="queryInfo.pageSize"
+					class="pagination"
+					@pagination="getRemoveList"
+				/>
        </div>
       </div>
    </div>
diff --git a/warehousing-system/project_web_ui/src/views/component/storehouseManage/shelvesManage.vue b/warehousing-system/project_web_ui/src/views/component/storehouseManage/shelvesManage.vue
index f7b223d0..d9fc1b1e 100644
--- a/warehousing-system/project_web_ui/src/views/component/storehouseManage/shelvesManage.vue
+++ b/warehousing-system/project_web_ui/src/views/component/storehouseManage/shelvesManage.vue
@@ -92,16 +92,16 @@
           width="180">
         </el-table-column>
       </el-table>
-       <div class="pages">
-         <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="queryInfo.pageNum"
-            :page-sizes="[10, 20, 30, 40]"
-            :page-size="queryInfo.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total">
-         </el-pagination>   
+       <div class="pages"> 
+         <div class="tit" />
+        <pagination
+					v-show="onShelvesList.length > 0"
+          :total="total"
+					:page.sync="queryInfo.pageNum"
+					:limit.sync="queryInfo.pageSize"
+					class="pagination"
+					@pagination="getShelves"
+				/>
         </div>
       </div>
     </div>