ysy пре 2 година
родитељ
комит
f87bc67e51

+ 1 - 1
src/views/warehousing/components/search.vue

@@ -53,7 +53,7 @@ export default {
         return {
             // 表单数据
             where: { ...defaultWhere },
-       
+
         };
     },
     computed: {

+ 98 - 2
src/views/warehousing/components/tgDetails.vue

@@ -1,9 +1,15 @@
 <template>
   <ele-modal :visible.sync="visible" title="入库详情" width="1200px">
-    <ele-pro-table :columns="columns" :datasource="tableList" cache-key="tgDetails" height="calc(100vh - 350px)"
+    <ele-pro-table v-if="clientEnvironmentId == 3" :columns="columns" :datasource="tableList" cache-key="tgDetails" height="calc(100vh - 350px)"
       :need-page="false">
 
 
+      
+
+
+
+
+
       <template v-slot:materielCode="{ row }">
         {{ row.extInfo.materielCode }}
       </template>
@@ -20,8 +26,23 @@
 
 
 
+    </ele-pro-table>
+
+
+    <ele-pro-table v-if="clientEnvironmentId == 2" :columns="columns2" :datasource="tableList" cache-key="srDetails" height="calc(100vh - 350px)"
+      :need-page="false">
+
+      <template v-slot:quantity="{ row }">
+        {{ row.quantity }} {{ row.measuringUnit  }}
+      </template>
+
+
+
+
 
     </ele-pro-table>
+
+
   </ele-modal>
 </template>
 
@@ -29,6 +50,12 @@
 
 export default {
 
+
+  computed: {
+    clientEnvironmentId() {
+            return this.$store.state.user.info.clientEnvironmentId;
+        },
+  },
   data() {
     return {
       visible: false,
@@ -84,7 +111,7 @@ export default {
 
         {
           label: '包装内总数量',
-          prop: 'quantity'
+          slot: 'quantity'
         },
 
 
@@ -111,6 +138,75 @@ export default {
 
 
 
+      ],
+
+
+      columns: [
+        {
+          label: '序号',
+          type: 'index',
+          width: 55,
+          align: 'center'
+        },
+
+        {
+          label: '入库申请单id',
+          prop: 'applyStorageId'
+        },
+
+
+
+        {
+          label: '物品名称',
+          prop: 'categoryName'
+        },
+        {
+          label: '物品分类名称',
+          prop: 'categoryLevelName'
+        },
+
+        {
+          label: '牌号',
+          prop: 'brandNum'
+        },
+
+        {
+          label: '型号',
+          prop: 'modelType'
+        },
+
+        {
+          label: '包装数量',
+          prop: 'packingCount'
+        },
+
+        {
+          label: '包装单位',
+          prop: 'packingUnit'
+        },
+
+        {
+          label: '本包重量',
+          prop: 'packingWeight'
+        },
+
+        {
+          label: '包装内总数量',
+          slot: 'quantity'
+        },
+
+
+
+        {
+          label: '发货码',
+          prop: 'sendCode'
+        },
+
+
+
+
+
+
       ]
 
 

+ 0 - 2
src/views/warehousing/index.vue

@@ -191,9 +191,7 @@ export default {
 
 
         details(row) {
-
             this.$refs.tgDetailsRefs.open(row)
-
         },