代码优化整理

src/api/retrieval.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function listRetrieval(query) {
   return request({
-    url: '/warehouse-entry/page',
+    url: '/warehouse-out/page',
     method: 'get',
     params: query
   })
@@ -10,7 +10,7 @@ export function listRetrieval(query) {
 
 export function executeRetrieval(query) {
   return request({
-    url: '/warehouse-entry/execute',
+    url: '/warehouse-out/execute',
     method: 'post',
     params:query
   })
@@ -18,7 +18,7 @@ export function executeRetrieval(query) {
 
 export function createRetrieval(data) {
   return request({
-    url: '/warehouse-entry/add',
+    url: '/warehouse-out/add',
     method: 'post',
     data
   })
@@ -26,7 +26,7 @@ export function createRetrieval(data) {
 
 export function readRetrieval(query) {
   return request({
-    url: '/warehouse-entry/info',
+    url: '/warehouse-out/info',
     method: 'get',
     params:query
   })
@@ -34,7 +34,7 @@ export function readRetrieval(query) {
 
 export function updateRetrieval(data) {
   return request({
-    url: '/warehouse-entry/edit',
+    url: '/warehouse-out/edit',
     method: 'post',
     data
   })
@@ -42,7 +42,7 @@ export function updateRetrieval(data) {
 
 export function deleteRetrieval(query) {
   return request({
-    url: '/warehouse-entry/remove',
+    url: '/warehouse-out/remove',
     method: 'post',
     params:query
   })

src/ui-components/PickerGoods/src/main.js

@@ -14,7 +14,7 @@ const Goods = function(options) {
   return new Promise((resolve, reject) => {
     options = options || {}
     if (!options.goodsApi) {
-      options.goodsApi = process.env.BASE_API +'/warehouse-entry/info/inventory';
+      options.goodsApi = process.env.BASE_API +'/warehouse-info/info/inventory';
     }
     let id = 'goods_picker_' + seed++
     options.show = true

src/views/stock/retrieval/retrieval.vue

@@ -3,10 +3,10 @@
     <!-- 查询和其他操作 -->
     <div class="filter-container">
       <el-date-picker v-model="listQuery.startDate" value-format="yyyy-MM-dd" type="date" placeholder="开始日期"
-        style="width:200px">
+      class="filter-item" style="width:200px">
       </el-date-picker>
       <el-date-picker v-model="listQuery.endDate" value-format="yyyy-MM-dd" type="date" placeholder="结束日期"
-        style="width:200px">
+      class="filter-item" style="width:200px">
       </el-date-picker>
       <treeselect class="filter-item" default-expand-all v-model="listQuery.requireDepartmentId" :options="deptOptions"
                 :normalizer="normalizer" placeholder="出库部门" style="width: 200px" />
@@ -28,7 +28,7 @@
       <el-button class="filter-item" type="primary" @click="handleCreate" icon="el-icon-plus">添加</el-button>
       <!-- <el-button class="filter-item" :loading="downloadLoading" v-waves icon="el-icon-download"
         @click="handleDownload">导出</el-button> -->
-      <!-- <el-button class="filter-item" type="success" icon="el-icon-takeaway-box" @click="executeAll">批量入库</el-button> -->
+      <!-- <el-button class="filter-item" type="success" icon="el-icon-takeaway-box" @click="executeAll">批量发货</el-button> -->
       <el-button class="filter-item" type="warning" icon="el-icon-delete" @click="delAll">批量删除</el-button>
     </div>
 
@@ -61,7 +61,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" width="240px" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button v-if="scope.row.isRunFinish == '1'" type="success" size="small" @click="handleExecute(scope.row)">入库</el-button>
+          <el-button v-if="scope.row.isRunFinish == '1'" type="success" size="small" @click="handleExecute(scope.row)">发货</el-button>
           <el-button type="primary" size="small" @click="handleUpdate(scope.row)">编辑</el-button>
           <el-button type="danger" size="small" @click="handleDelete(scope.row)">删除</el-button>
         </template>
@@ -226,7 +226,7 @@ export default {
       })
     },
     handleExecute(row) {
-      this.$confirm('确认入库吗?', '提示', {
+      this.$confirm('确认发货吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -234,7 +234,7 @@ export default {
         executeRetrieval({ ids: row.id }).then(response => {
           this.$notify({
             title: '成功',
-            message: '入库成功',
+            message: '发货成功',
             type: 'success',
             duration: 2000
           })
@@ -245,7 +245,7 @@ export default {
     executeAll() {
       const length = this.multipleSelection.length;
       if (length > 0) {
-        this.$confirm("确认入库吗?", "提示", {
+        this.$confirm("确认发货吗?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
@@ -257,7 +257,7 @@ export default {
           executeRetrieval({ ids: ids }).then(() => {
             this.$notify({
               title: "成功",
-              message: "入库成功",
+              message: "发货成功",
               type: "success",
               duration: 2000,
             });
@@ -267,7 +267,7 @@ export default {
       } else {
         this.$notify({
           title: "提示",
-          message: "请选择要入库的信息！",
+          message: "请选择要发货的信息！",
           type: "warning",
         });
       }

src/views/stock/warehousing/warehousing.vue

@@ -3,10 +3,10 @@
     <!-- 查询和其他操作 -->
     <div class="filter-container">
       <el-date-picker v-model="listQuery.startDate" value-format="yyyy-MM-dd" type="date" placeholder="开始日期"
-        style="width:200px">
+      class="filter-item" style="width:200px">
       </el-date-picker>
       <el-date-picker v-model="listQuery.endDate" value-format="yyyy-MM-dd" type="date" placeholder="结束日期"
-        style="width:200px">
+      class="filter-item" style="width:200px">
       </el-date-picker>
       <el-select v-model="listQuery.warehouseId" clearable placeholder="请选择仓库" class="filter-item" style="width: 200px">
         <el-option :key="item.id" v-for="item in warehouseList" :label="item.warehouseName" :value="item.id">

src/views/stock/warehousing/warehousingAdd.vue

@@ -198,6 +198,7 @@ export default {
                 dataForm.inventoryEntryInfos = dataForm.inventoryEntryInfos == null ? [] : dataForm.inventoryEntryInfos
                 dataForm.inventoryOutInfos = dataForm.inventoryOutInfos == null ? [] : dataForm.inventoryOutInfos
                 this.dataForm = dataForm;
+                this.dataForm.fileList = dataForm.files == null ? [] : dataForm.files;
             }).catch(() => {})
         },
          // 选择商品