土工试验Lims

api/soil/soil-entrust.js

@@ -149,6 +149,8 @@ export default {
     http.post('soil/v1/alone_sample/', data).then(res => res),
   aloneSampleGetById: data =>
     http.get('soil/v1/alone_sample/' + data).then(res => res),
+  getAloneVOById: data =>
+    http.get('soil/v1/alone_sample/vo/' + data).then(res => res),
   aloneSampleEdit: data =>
     http.put('soil/v1/alone_sample/' + data.id, data).then(res => res),
   aloneSampleDelete: data =>

pages/soil-alone-sample-instock/EntrustRegister.vue

@@ -393,7 +393,7 @@ export default {
       }
     },
     _getDetailById: async function(id) {
-      const result = await soilEntrust.aloneSampleGetById(id)
+      const result = await soilEntrust.getAloneVOById(id)
       if (result) {
         this.$refs.refModal._open(result)
         this.$refs.pageTable._hideLoading()
@@ -409,7 +409,7 @@ export default {
       })
     },
     _getById: async function(id) {
-      const result = await soilEntrust.aloneSampleGetById(id)
+      const result = await soilEntrust.getAloneVOById(id)
       if (result) {
         this.$refs.refModal._openEdit(result)
         this.$refs.pageTable._hideLoading()

pages/soil-alone-sample-instock/EntrustRegisterHis.vue

@@ -183,7 +183,7 @@ export default {
       }
     },
     _getDetailById: async function(id) {
-      const result = await soilEntrust.aloneSampleGetById(id)
+      const result = await soilEntrust.getAloneVOById(id)
       if (result) {
         this.$refs.refModal._open(result)
         this.$refs.pageTable._hideLoading()

pages/soil-alone-sample-instock/ViewDetail.vue

@@ -31,6 +31,23 @@
             <th>登记日期</th>
             <td>{{$dateformat(obj.registTime,'yyyy-mm-dd')}}</td>
           </tr>
+          <tr>
+            <th>库房号</th>
+            <td>{{obj.storehouse}}</td>
+            <th>货架号</th>
+            <td>{{obj.shelfCode}}</td>
+          </tr>
+
+          <tr>
+            <th>入库人</th>
+            <td>{{obj.inStocker}}</td>
+            <th>入库时间</th>
+            <td>{{$dateformat(obj.instockTime,'yyyy-mm-dd')}}</td>
+          </tr>
+          <tr>
+            <th>留存有效期</th>
+            <td>{{$dateformat(obj.keepLimitTime,'yyyy-mm-dd')}}</td>
+          </tr>
           </tbody>
         </table>
       </div>
@@ -69,7 +86,7 @@ export default {
       } else {
         this.showMoney = false
       }
-      this.height = '220px'
+      this.height = '320px'
     }
   }
 }

pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustIndex.vue

@@ -7,7 +7,6 @@
           <el-tab-pane label="历史记录" name="his"></el-tab-pane>
         </el-tabs>
         <keep-alive>
-          <!-- eslint-disable-next-line vue/require-component-is -->
           <component ref="refModal" :is="currentComponent"></component>
         </keep-alive>
       </div>

pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustRegister.vue

@@ -381,7 +381,7 @@ export default {
       }
     },
     _getDetailById: async function(id) {
-      const result = await soilEntrust.aloneSampleGetById(id)
+      const result = await soilEntrust.getAloneVOById(id)
       if (result) {
         this.$refs.refModal._open(result)
         this.$refs.pageTable._hideLoading()
@@ -397,7 +397,7 @@ export default {
       })
     },
     _getById: async function(id) {
-      const result = await soilEntrust.aloneSampleGetById(id)
+      const result = await soilEntrust.getAloneVOById(id)
       if (result) {
         this.$refs.refModal._openEdit(result)
         this.$refs.pageTable._hideLoading()

pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustRegisterHis.vue

@@ -172,7 +172,7 @@ export default {
       }
     },
     _getDetailById: async function(id) {
-      const result = await soilEntrust.aloneSampleGetById(id)
+      const result = await soilEntrust.getAloneVOById(id)
       if (result) {
         this.$refs.refModal._open(result)
         this.$refs.pageTable._hideLoading()

pages/soil-alone-sample-manage/soil-alone-sample-outstock/ViewDetail.vue

@@ -31,6 +31,34 @@
             <th>登记日期</th>
             <td>{{$dateformat(obj.registTime,'yyyy-mm-dd')}}</td>
           </tr>
+
+          <tr>
+            <th>库房号</th>
+            <td>{{obj.storehouse}}</td>
+            <th>货架号</th>
+            <td>{{obj.shelfCode}}</td>
+          </tr>
+
+          <tr>
+            <th>入库人</th>
+            <td>{{obj.inStocker}}</td>
+            <th>入库时间</th>
+            <td>{{$dateformat(obj.instockTime,'yyyy-mm-dd')}}</td>
+          </tr>
+          <tr>
+            <th>留存有效期</th>
+            <td>{{$dateformat(obj.keepLimitTime,'yyyy-mm-dd')}}</td>
+            <th>出库人</th>
+            <td>{{obj.outStocker}}</td>
+          </tr>
+
+          <tr>
+            <th>出库时间</th>
+            <td>{{$dateformat(obj.outStock,'yyyy-mm-dd')}}</td>
+            <th>出库接收人</th>
+            <td>{{obj.outStockReceiver}}</td>
+          </tr>
+
           </tbody>
         </table>
       </div>

pages/soil-alone-sample-manage/storehouse-sample-manage/AddressManage.vue

@@ -249,7 +249,7 @@ export default {
       }
     },
     _getDetailById: async function(id) {
-      const result = await soilEntrust.aloneSampleGetById(id)
+      const result = await soilEntrust.getAloneVOById(id)
       if (result) {
         this.$refs.viewDetail._open(result)
         this.$refs.pageTable._hideLoading()
@@ -273,7 +273,7 @@ export default {
       }
     },
     _getById: async function(id) {
-      const result = await soilEntrust.aloneSampleGetById(id)
+      const result = await soilEntrust.getAloneVOById(id)
       if (result) {
         this.$refs.editModal._openEdit(result)
         this.$refs.pageTable._hideLoading()

pages/soil-alone-sample-manage/storehouse-sample-manage/AddressManageHis.vue

@@ -260,7 +260,7 @@ export default {
       }
     },
     _getDetailById: async function(id) {
-      const result = await soilEntrust.aloneSampleGetById(id)
+      const result = await soilEntrust.getAloneVOById(id)
       if (result) {
         this.$refs.viewDetail._open(result)
         this.$refs.pageTable._hideLoading()
@@ -284,7 +284,7 @@ export default {
       }
     },
     _getById: async function(id) {
-      const result = await soilEntrust.aloneSampleGetById(id)
+      const result = await soilEntrust.getAloneVOById(id)
       if (result) {
         this.$refs.editModal._openEdit(result)
         this.$refs.pageTable._hideLoading()

pages/soil-alone-sample/EntrustRegister.vue

@@ -364,7 +364,7 @@ export default {
       }
     },
     _getDetailById: async function(id) {
-      const result = await soilEntrust.aloneSampleGetById(id)
+      const result = await soilEntrust.getAloneVOById(id)
       if (result) {
         this.$refs.refModal._open(result)
         this.$refs.pageTable._hideLoading()
@@ -380,7 +380,7 @@ export default {
       })
     },
     _getById: async function(id) {
-      const result = await soilEntrust.aloneSampleGetById(id)
+      const result = await soilEntrust.getAloneVOById(id)
       if (result) {
         this.$refs.refModal._openEdit(result)
         this.$refs.pageTable._hideLoading()

pages/soil-alone-sample/EntrustRegisterHis.vue

@@ -172,7 +172,7 @@ export default {
       }
     },
     _getDetailById: async function(id) {
-      const result = await soilEntrust.aloneSampleGetById(id)
+      const result = await soilEntrust.getAloneVOById(id)
       if (result) {
         this.$refs.refModal._open(result)
         this.$refs.pageTable._hideLoading()

pages/soil-alone-sample/ViewDetail.vue

@@ -31,6 +31,24 @@
             <th>登记日期</th>
             <td>{{$dateformat(obj.registTime,'yyyy-mm-dd')}}</td>
           </tr>
+
+          <tr>
+            <th>库房号</th>
+            <td>{{obj.storehouse}}</td>
+            <th>货架号</th>
+            <td>{{obj.shelfCode}}</td>
+          </tr>
+
+          <tr>
+            <th>入库人</th>
+            <td>{{obj.inStocker}}</td>
+            <th>入库时间</th>
+            <td>{{$dateformat(obj.instockTime,'yyyy-mm-dd')}}</td>
+          </tr>
+          <tr>
+            <th>留存有效期</th>
+            <td>{{$dateformat(obj.keepLimitTime,'yyyy-mm-dd')}}</td>
+          </tr>
           </tbody>
         </table>
       </div>
@@ -68,7 +86,7 @@ export default {
       } else {
         this.showMoney = false
       }
-      this.height = '250px'
+      this.height = '390px'
     }
   }
 }