调拨单修改

src/api/assembly.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function listAssembly(query) {
   return request({
-    url: '/warehouse-entry/page',
+    url: '/warehouse-assembly/page',
     method: 'get',
     params: query
   })
@@ -10,7 +10,7 @@ export function listAssembly(query) {
 
 export function executeAssembly(query) {
   return request({
-    url: '/warehouse-entry/execute',
+    url: '/warehouse-assembly/execute',
     method: 'post',
     params:query
   })
@@ -18,7 +18,7 @@ export function executeAssembly(query) {
 
 export function createAssembly(data) {
   return request({
-    url: '/warehouse-entry/add',
+    url: '/warehouse-assembly/add',
     method: 'post',
     data
   })
@@ -26,7 +26,7 @@ export function createAssembly(data) {
 
 export function readAssembly(query) {
   return request({
-    url: '/warehouse-entry/info',
+    url: '/warehouse-assembly/info',
     method: 'get',
     params:query
   })
@@ -34,7 +34,7 @@ export function readAssembly(query) {
 
 export function updateAssembly(data) {
   return request({
-    url: '/warehouse-entry/edit',
+    url: '/warehouse-assembly/edit',
     method: 'post',
     data
   })
@@ -42,7 +42,7 @@ export function updateAssembly(data) {
 
 export function deleteAssembly(query) {
   return request({
-    url: '/warehouse-entry/remove',
+    url: '/warehouse-assembly/remove',
     method: 'post',
     params:query
   })

src/api/breakage.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function listBreakage(query) {
   return request({
-    url: '/warehouse-entry/page',
+    url: '/warehouse-breakage/page',
     method: 'get',
     params: query
   })
@@ -10,7 +10,7 @@ export function listBreakage(query) {
 
 export function executeBreakage(query) {
   return request({
-    url: '/warehouse-entry/execute',
+    url: '/warehouse-breakage/execute',
     method: 'post',
     params:query
   })
@@ -18,7 +18,7 @@ export function executeBreakage(query) {
 
 export function createBreakage(data) {
   return request({
-    url: '/warehouse-entry/add',
+    url: '/warehouse-breakage/add',
     method: 'post',
     data
   })
@@ -26,7 +26,7 @@ export function createBreakage(data) {
 
 export function readBreakage(query) {
   return request({
-    url: '/warehouse-entry/info',
+    url: '/warehouse-breakage/info',
     method: 'get',
     params:query
   })
@@ -34,7 +34,7 @@ export function readBreakage(query) {
 
 export function updateBreakage(data) {
   return request({
-    url: '/warehouse-entry/edit',
+    url: '/warehouse-breakage/edit',
     method: 'post',
     data
   })
@@ -42,7 +42,7 @@ export function updateBreakage(data) {
 
 export function deleteBreakage(query) {
   return request({
-    url: '/warehouse-entry/remove',
+    url: '/warehouse-breakage/remove',
     method: 'post',
     params:query
   })

src/api/disassembly.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function listDisassembly(query) {
   return request({
-    url: '/warehouse-entry/page',
+    url: '/warehouse-disassembly/page',
     method: 'get',
     params: query
   })
@@ -10,7 +10,7 @@ export function listDisassembly(query) {
 
 export function executeDisassembly(query) {
   return request({
-    url: '/warehouse-entry/execute',
+    url: '/warehouse-disassembly/execute',
     method: 'post',
     params:query
   })
@@ -18,7 +18,7 @@ export function executeDisassembly(query) {
 
 export function createDisassembly(data) {
   return request({
-    url: '/warehouse-entry/add',
+    url: '/warehouse-disassembly/add',
     method: 'post',
     data
   })
@@ -26,7 +26,7 @@ export function createDisassembly(data) {
 
 export function readDisassembly(query) {
   return request({
-    url: '/warehouse-entry/info',
+    url: '/warehouse-disassembly/info',
     method: 'get',
     params:query
   })
@@ -34,7 +34,7 @@ export function readDisassembly(query) {
 
 export function updateDisassembly(data) {
   return request({
-    url: '/warehouse-entry/edit',
+    url: '/warehouse-disassembly/edit',
     method: 'post',
     data
   })
@@ -42,7 +42,7 @@ export function updateDisassembly(data) {
 
 export function deleteDisassembly(query) {
   return request({
-    url: '/warehouse-entry/remove',
+    url: '/warehouse-disassembly/remove',
     method: 'post',
     params:query
   })

src/api/requisition.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function listRequisition(query) {
   return request({
-    url: '/warehouse-entry/page',
+    url: '/warehouse-requisition/page',
     method: 'get',
     params: query
   })
@@ -10,7 +10,7 @@ export function listRequisition(query) {
 
 export function executeRequisition(query) {
   return request({
-    url: '/warehouse-entry/execute',
+    url: '/warehouse-requisition/execute',
     method: 'post',
     params:query
   })
@@ -18,7 +18,7 @@ export function executeRequisition(query) {
 
 export function createRequisition(data) {
   return request({
-    url: '/warehouse-entry/add',
+    url: '/warehouse-requisition/add',
     method: 'post',
     data
   })
@@ -26,7 +26,7 @@ export function createRequisition(data) {
 
 export function readRequisition(query) {
   return request({
-    url: '/warehouse-entry/info',
+    url: '/warehouse-requisition/info',
     method: 'get',
     params:query
   })
@@ -34,7 +34,7 @@ export function readRequisition(query) {
 
 export function updateRequisition(data) {
   return request({
-    url: '/warehouse-entry/edit',
+    url: '/warehouse-requisition/edit',
     method: 'post',
     data
   })
@@ -42,7 +42,7 @@ export function updateRequisition(data) {
 
 export function deleteRequisition(query) {
   return request({
-    url: '/warehouse-entry/remove',
+    url: '/warehouse-requisition/remove',
     method: 'post',
     params:query
   })

src/api/stockCount.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function listStockCount(query) {
   return request({
-    url: '/warehouse-entry/page',
+    url: '/warehouse-stockCount/page',
     method: 'get',
     params: query
   })
@@ -10,7 +10,7 @@ export function listStockCount(query) {
 
 export function executeStockCount(query) {
   return request({
-    url: '/warehouse-entry/execute',
+    url: '/warehouse-stockCount/execute',
     method: 'post',
     params:query
   })
@@ -18,7 +18,7 @@ export function executeStockCount(query) {
 
 export function createStockCount(data) {
   return request({
-    url: '/warehouse-entry/add',
+    url: '/warehouse-stockCount/add',
     method: 'post',
     data
   })
@@ -26,7 +26,7 @@ export function createStockCount(data) {
 
 export function readStockCount(query) {
   return request({
-    url: '/warehouse-entry/info',
+    url: '/warehouse-stockCount/info',
     method: 'get',
     params:query
   })
@@ -34,7 +34,7 @@ export function readStockCount(query) {
 
 export function updateStockCount(data) {
   return request({
-    url: '/warehouse-entry/edit',
+    url: '/warehouse-stockCount/edit',
     method: 'post',
     data
   })
@@ -42,7 +42,7 @@ export function updateStockCount(data) {
 
 export function deleteStockCount(query) {
   return request({
-    url: '/warehouse-entry/remove',
+    url: '/warehouse-stockCount/remove',
     method: 'post',
     params:query
   })

src/api/swap.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function listSwap(query) {
   return request({
-    url: '/warehouse-entry/page',
+    url: '/warehouse-swap/page',
     method: 'get',
     params: query
   })
@@ -10,7 +10,7 @@ export function listSwap(query) {
 
 export function executeSwap(query) {
   return request({
-    url: '/warehouse-entry/execute',
+    url: '/warehouse-swap/execute',
     method: 'post',
     params:query
   })
@@ -18,7 +18,7 @@ export function executeSwap(query) {
 
 export function createSwap(data) {
   return request({
-    url: '/warehouse-entry/add',
+    url: '/warehouse-swap/add',
     method: 'post',
     data
   })
@@ -26,7 +26,7 @@ export function createSwap(data) {
 
 export function readSwap(query) {
   return request({
-    url: '/warehouse-entry/info',
+    url: '/warehouse-swap/info',
     method: 'get',
     params:query
   })
@@ -34,7 +34,7 @@ export function readSwap(query) {
 
 export function updateSwap(data) {
   return request({
-    url: '/warehouse-entry/edit',
+    url: '/warehouse-swap/edit',
     method: 'post',
     data
   })
@@ -42,7 +42,7 @@ export function updateSwap(data) {
 
 export function deleteSwap(query) {
   return request({
-    url: '/warehouse-entry/remove',
+    url: '/warehouse-swap/remove',
     method: 'post',
     params:query
   })

src/views/stock/requisition/requisition.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/retrieval/retrievalAdd.vue

@@ -66,7 +66,7 @@
             <el-table-column label="金额(￥)">
               <template slot-scope="scope">
                 <el-form-item v-if="type !== 'detail'" :prop="'inventoryOutInfos.'+scope.$index+'.sellPrice'"
-                    :rules="{ required: true, pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,2})?$/, message: '请输入合法的金额数字，最多两位小数',trigger: 'blur' }">
+                    :rules="{ required: true, pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,2})?$/, message: '请输入合法的金额数字，最多两位小数',trigger: 'blur' }" class="tableFormItem">
                     <el-input v-model="scope.row.sellPrice" size="small" placeholder="金额"></el-input>
                   </el-form-item>
                 <span v-else>{{ scope.row.sellPrice.toFixed(2) }}</span>
@@ -79,7 +79,8 @@
             </el-table-column>
             <el-table-column label="备注">
               <template slot-scope="scope">
-                <el-input :maxlength="99" v-model="scope.row.remark" :disabled="type === 'detail'" />
+                <el-input v-if="type !== 'detail'" :maxlength="99" v-model="scope.row.remarks"/>
+                <span v-else>{{ scope.row.remarks }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" width="150" v-if="type !== 'detail'">