库存撤回及工单号

src/api/base/stock.js

@@ -49,6 +49,10 @@ function batchOut(idList) {
   });
 }
 
+function back(id) {
+  return request.post(constant.serverUrl + "/base/stock/back/" + id);
+}
+
 export default {
-  pageList, create, edit, add, update, remove, batchRemove, batchOut
+  pageList, create, edit, add, update, remove, batchRemove, batchOut, back
 }

src/views/base/stock-list.vue

@@ -16,7 +16,7 @@
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
       <el-form-item label="工单" prop="workId">
         <el-select size="mini" v-model="queryModel.workId" filterable>
-          <el-option v-for="work in workList" :key="work.id" :label="work.name" :value="work.id"></el-option>
+          <el-option v-for="work in workList" :key="work.id" :label="work.number" :value="work.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="瑕疵" prop="flaw">
@@ -24,8 +24,9 @@
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select size="mini" v-model="queryModel.status" filterable>
-          <el-option label="已入库" :value="false"></el-option>
-          <el-option label="已出库" :value="true"></el-option>
+          <el-option label="未完成" value="0"></el-option>
+          <el-option label="已入库" value="1"></el-option>
+          <el-option label="已出库" value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -47,12 +48,18 @@
       <el-table-column prop="flaw" label="瑕疵" width="180"></el-table-column>
       <el-table-column label="状态" width="180">
         <template slot-scope="{row}">
-          <span v-if="row.status">已出库</span>
-          <span v-else>已入库</span>
+          <span v-if="row.status == 0">未完成</span>
+          <span v-if="row.status == 1">已入库</span>
+          <span v-if="row.status == 2">已出库</span>
         </template>
       </el-table-column>
       <el-table-column prop="createTime" label="入库时间" width="180"></el-table-column>
       <el-table-column prop="updateTime" label="出库时间" width="180"></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="{row}">
+          <el-button v-if="row.status == 2" size="mini" type="warning" @click="handleBack(row)">撤回</el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <el-pagination :current-page.sync="pageIndex" :total="totalElements" :page-sizes="pageSizeList" @current-change="changePage" @size-change="pageSizeChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
   </div>
@@ -158,6 +165,25 @@ export default {
         });
       });
     },
+    handleBack(record) {
+      var self = this;
+
+      self.$confirm("是否确认撤回?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        stockApi.back(record.id).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({type: "success", message: "撤回成功!"});
+          }
+        });
+      });
+    },
   },
   mounted: function () {
     workApi.findList().then(response => {