详情页改造

src/views/modules/check/ibc-detail.vue

@@ -23,6 +23,7 @@
         </e-desc>
         <e-desc title="检验项目">
           <el-table
+            border
             :data="checkList">
             <el-table-column
               label="序号"

src/views/modules/warehouse/stock-order-detail.vue

@@ -0,0 +1,158 @@
+<template>
+    <el-dialog
+      title="详情"
+      width="80%"
+      :close-on-click-modal="false"
+      :visible.sync="visible">
+      <div style="margin-left: 20px;margin-right: 20px">
+        <e-desc title="基本信息">
+          <e-desc-item label="编码">{{dataForm.recordCode}}</e-desc-item>
+          <e-desc-item label="出入库申请人">{{dataForm.applicant}}</e-desc-item>
+          <e-desc-item label="申请人部门">{{dataForm.orgName}}</e-desc-item>
+        </e-desc>
+        <e-desc title="出入库详情">
+          <el-table
+            border
+            :data="dataList">
+            <el-table-column
+              label="序号"
+              type="index"
+              align="center"
+              width="50"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="materialName"
+              header-align="center"
+              align="center"
+              width="160"
+              :show-tooltip-when-overflow="true"
+              label="名称">
+            </el-table-column>
+            <el-table-column
+              prop="categoryName"
+              header-align="center"
+              align="center"
+              label="类别">
+            </el-table-column>
+            <el-table-column
+              prop="unitName"
+              header-align="center"
+              align="center"
+              label="单位">
+            </el-table-column>
+            <el-table-column
+              prop="specifications"
+              header-align="center"
+              align="center"
+              label="规格">
+            </el-table-column>
+            <el-table-column
+              prop="batchNumber"
+              header-align="center"
+              align="center"
+              width="140"
+              :show-tooltip-when-overflow="true"
+              label="批次号">
+            </el-table-column>
+            <el-table-column
+              prop="unitName"
+              header-align="center"
+              align="center"
+              label="单位">
+            </el-table-column>
+            <el-table-column
+              prop="price"
+              header-align="center"
+              align="center"
+              label="单价">
+            </el-table-column>
+            <el-table-column
+              prop="cnt"
+              header-align="center"
+              align="center"
+              label="数量">
+            </el-table-column>
+            <el-table-column
+              prop="-"
+              header-align="center"
+              align="center"
+              label="金额">
+              <template slot-scope="scope">
+                <span>{{ scope.row.price * scope.row.cnt }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="source"
+              header-align="center"
+              align="center"
+              width="140"
+              :show-tooltip-when-overflow="true"
+              label="来源">
+            </el-table-column>
+            <el-table-column
+              prop="conversionName"
+              header-align="center"
+              align="center"
+              width="140"
+              :show-tooltip-when-overflow="true"
+              label="是否换算">
+            </el-table-column>
+            <el-table-column
+              prop="notes"
+              header-align="center"
+              align="center"
+              width="140"
+              :show-tooltip-when-overflow="true"
+              label="备注">
+            </el-table-column>
+          </el-table>
+        </e-desc>
+      </div><span slot="footer" class="dialog-footer">
+        <el-button @click="visible = false">取消</el-button>
+      </span>
+
+    </el-dialog>
+</template>
+
+<script>
+  import EDesc from '../common/e-desc'
+  import EDescItem from '../common/e-desc-item'
+  import { getBoundDetails } from '@/api/warehouse'
+  export default {
+    name: 'stock-order-detail',
+    components: {
+      EDesc, EDescItem
+    },
+    data () {
+      return {
+        visible: false,
+        dataForm: {},
+        dataList: []
+      }
+    },
+    methods: {
+      async init (id) {
+        this.visible = true
+        this.dataForm = {}
+        this.dataList = []
+        await getBoundDetails(id).then(({data}) => {
+          if (data && data.code === '200') {
+            if (data.data[0]) {
+              this.dataForm = {
+                recordCode: data.data[0].recordCode,
+                applicant: data.data[0].applicant,
+                orgName: data.data[0].orgName
+              }
+            }
+            this.dataList = data.data
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/modules/warehouse/stock-order-inbound.vue

@@ -11,17 +11,6 @@
             <el-input v-model="dataForm.recordCode" :disabled="true" placeholder="编码系统自动生成"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="padding-left: 20px">
-          <el-form-item label="入库申请人" prop="userId">
-            <el-input v-if="display" v-model="dataForm.applicant" :disabled="true"/>
-            <user-component v-else v-model="dataForm.userId" @userSelected="userChanged"></user-component>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" style="padding-left: 20px">
-          <el-form-item label="申请人部门" prop="orgName">
-            <el-input :disabled="true" v-model="dataForm.orgName" placeholder="自动匹配"></el-input>
-          </el-form-item>
-        </el-col>
       </el-row>
       <template v-for="(item, index) in dataList">
         <div :key="index" class="my-line">
@@ -150,16 +139,10 @@
 <script>
   import UserComponent from '../common/user-component'
   import DictSelect from '../sys/dict-select'
-  import { getUserInfo } from '@/api/user'
   import { getMaterialList, getConversionList, inboundBatch, getBoundDetails, getMaterialTypes } from '@/api/warehouse'
   export default {
     name: 'stock-order-inbound',
     components: {DictSelect, UserComponent},
-    computed: {
-      orgId: {
-        get () { return this.$store.state.user.orgId }
-      }
-    },
     data () {
       return {
         visible: false,
@@ -188,7 +171,6 @@
           // 获取详情
           await getBoundDetails(id).then(({data}) => {
             if (data && data.code === '200') {
-              console.log('data = ' + JSON.stringify(data.data))
               if (data.data[0]) {
                 this.dataForm = {
                   recordCode: data.data[0].recordCode,
@@ -253,14 +235,15 @@
                 materialName: item.materialName ? item.materialName : item.materialId,
                 materialTypeId: item.materialTypeId ? item.materialTypeId : item.cateId,
                 notes: item.notes,
-                orgId: this.orgId,
+                orgId: this.$store.state.user.orgId,
                 price: item.price,
                 recordCode: this.dataForm.recordCode,
                 recordType: this.dataForm.recordType,
                 source: item.source,
                 specifications: item.specifications,
                 unitName: item.unitName,
-                unitNeedChange: item.unitNeedChange
+                unitNeedChange: item.unitNeedChange,
+                userId: this.$store.state.user.id
               })
             })
             inboundBatch(postData).then(({data}) => {
@@ -284,16 +267,6 @@
       validateField (type) {
         this.$refs.dataForm.validateField(type)
       },
-      userChanged (userId) {
-        getUserInfo(userId).then(({data}) => {
-          if (data && data.code === '200') {
-            this.dataForm.orgId = data.data.orgId
-            this.dataForm.orgName = data.data.orgName
-          } else {
-            this.$message.error(data.msg)
-          }
-        })
-      },
       // 远程方法：货物种类
       async remoteMaterialTypes (query) {
         if (!query) return

src/views/modules/warehouse/stock-order-outbound.vue

@@ -11,16 +11,16 @@
             <el-input v-model="dataForm.recordCode" :disabled="true" placeholder="编码系统自动生成"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="padding-left: 20px">
-          <el-form-item label="领料人" prop="userId">
-            <user-component v-model="dataForm.userId" @userSelected="userChanged"></user-component>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" style="padding-left: 20px">
-          <el-form-item label="领料人部门" prop="orgName">
-            <el-input :disabled="true" v-model="dataForm.orgName" placeholder="自动匹配"></el-input>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="8" style="padding-left: 20px">-->
+<!--          <el-form-item label="领料人" prop="userId">-->
+<!--            <user-component v-model="dataForm.userId" @userSelected="userChanged"></user-component>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--        <el-col :span="8" style="padding-left: 20px">-->
+<!--          <el-form-item label="领料人部门" prop="orgName">-->
+<!--            <el-input :disabled="true" v-model="dataForm.orgName" placeholder="自动匹配"></el-input>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
       </el-row>
       <template v-for="(item, index) in dataList">
         <div :key="index" class="my-line">
@@ -96,7 +96,6 @@
 <script>
   import UserComponent from '../common/user-component'
   import DictSelect from '../sys/dict-select'
-  import { getUserInfo } from '@/api/user'
   import { getMaterialList, outboundBatch } from '@/api/warehouse'
   import {getUUID} from '../../../utils'
   export default {
@@ -164,7 +163,7 @@
                 materialName: item.materialName,
                 materialTypeId: item.materialTypeId,
                 notes: item.notes,
-                orgId: this.dataForm.orgId,
+                orgId: this.$store.state.user.orgId,
                 price: item.price,
                 recordCode: this.dataForm.recordCode,
                 recordType: this.dataForm.recordType,
@@ -195,16 +194,6 @@
       validateField (type) {
         this.$refs.dataForm.validateField(type)
       },
-      userChanged (userId) {
-        getUserInfo(userId).then(({data}) => {
-          if (data && data.code === '200') {
-            this.dataForm.orgId = data.data.orgId
-            this.dataForm.orgName = data.data.orgName
-          } else {
-            this.$message.error(data.msg)
-          }
-        })
-      },
       // 远程方法：物料List
       async remoteMaterial (query) {
         if (!query) return

src/views/modules/warehouse/stock-order.vue

@@ -112,7 +112,7 @@
         width="150"
         label="操作">
         <template slot-scope="scope">
-          <el-button v-if="isAuth('wh:inon:info')" type="text" size="small" @click="inBound(scope.row.id, true)">查看</el-button>
+          <el-button v-if="isAuth('wh:inon:info')" type="text" size="small" @click="detailHandle(scope.row.id)">查看</el-button>
           <el-button v-if="false" type="text" size="small" @click="exportItem(scope.row.id)">导出</el-button>
           <el-button v-if="isAuth('wh:in:revoke')" type="text" size="small" @click="cancelItem(scope.row)">撤回</el-button>
         </template>
@@ -130,6 +130,7 @@
     <!--    入库-->
     <stock-order-inbound v-if="inboundVisible" ref="inbound" @refreshDataList="getDataList"></stock-order-inbound>
     <stock-order-outbound v-if="outboundVisible" ref="outbound" @refreshDataList="getDataList"></stock-order-outbound>
+    <detail v-if="detailVisible" ref="details"/>
   </div>
 </template>
 
@@ -137,11 +138,12 @@
   import UserComponent from '../common/user-component'
   import StockOrderInbound from './stock-order-inbound'
   import StockOrderOutbound from './stock-order-outbound'
+  import Detail from './stock-order-detail'
   import { revokeInOutBound } from '@/api/warehouse'
 
   export default {
     name: 'stock-order',
-    components: {StockOrderInbound, UserComponent, StockOrderOutbound},
+    components: {StockOrderInbound, UserComponent, StockOrderOutbound, Detail},
     created () {
       this.queryData()
     },
@@ -149,6 +151,7 @@
       return {
         inboundVisible: false,
         outboundVisible: false,
+        detailVisible: false,
         dataForm: {
           userId: '',
           date: '',
@@ -295,6 +298,12 @@
             this.$message.error(data.msg)
           }
         })
+      },
+      detailHandle (id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.details.init(id)
+        })
       }
     }
   }