Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/views/information/custom/compoments/detail/index.vue

@@ -91,14 +91,14 @@
       <a-row :gutter="24">
         <a-col :span="24">
           <a-form-item label="通讯地址">
-            <span class="white">{{ selectedRow.address }}</span>
+            <span class="white">{{ formatValue(selectedRow.address) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="24">
           <a-form-item label="备注">
-            <span class="white">{{ selectedRow.remark }}</span>
+            <span class="white">{{ formatValue(selectedRow.remark) }}</span>
           </a-form-item>
         </a-col>
       </a-row>

src/views/information/spot-contract/components/detail/index.vue

@@ -151,31 +151,31 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="保证金">
-            <span class="white">企业</span>
+            <span class="white">{{ formatValue(selectedRow.contractmargin) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="业务员">
-            <span class="white">深圳市前海矿业有限公司</span>
+            <span class="white">{{ formatValue(selectedRow.saleuserlogincode) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="跟单员">
-            <span class="white">前海矿业</span>
+            <span class="white">{{ formatValue(selectedRow.meruserlogincode) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="期货账户">
-            <span class="white">营业执照</span>
+            <span class="white">{{ formatValue(selectedRow.accountid) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="备注">
-            <span class="white">李顺利</span>
+            <span class="white">{{ formatValue(selectedRow.remark) }}</span>
           </a-form-item>
         </a-col>
       </a-row>

src/views/information/warehouse-info/compoments/detail/index.vue

@@ -12,16 +12,78 @@
                 @click="submit">关闭</a-button>
     </template>
     仓库信息详情
+      <a-form class="inlineForm"
+              :form="form"
+              @submit="handleSearch">
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="仓库类型">
+                      <span class="white">{{ getWareHouseTypeName(selectedRow.warehousetype) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="仓库名称">
+                      <span class="white">{{ formatValue(selectedRow.warehousename)}}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="仓库简称">
+                      <span class="white">{{ formatValue(selectedRow.warehousecode) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="联系人">
+                      <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="联系电话">
+                      <span class="white">{{ formatValue(selectedRow.contactnum) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="状态">
+                      <span class="white">{{ gerWareHouseStatusName(selectedRow.warehousestatus) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="所在地区">
+                      <span class="white">{{ formatValue(selectedRow.address) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="详细地址">
+                      <span class="white">{{ formatValue(selectedRow.address) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+      </a-form>
   </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import {defineComponent, PropType, ref} from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
+import {QueryCustomInfoType} from "@/services/go/ermcp/customInfo/interface";
+import {ErmcpWareHouseInfo} from "@/services/go/ermcp/warehouse-info/interface";
+import {gerWareHouseStatusName, getWareHouseTypeName} from "@/views/information/warehouse-info/setup";
+import {formatValue} from "@/common/methods";
 
 export default defineComponent({
     name: 'warehouse_info_btn-detail',
     components: {},
+    props:{
+        selectedRow: {
+            type: Object as PropType<ErmcpWareHouseInfo>,
+            default: {},
+        },
+    },
     setup() {
         const { visible, cancel } = closeModal('detail');
         const loading = ref<boolean>(false);
@@ -37,6 +99,9 @@ export default defineComponent({
             cancel,
             submit,
             loading,
+            gerWareHouseStatusName,
+            getWareHouseTypeName,
+            formatValue
         };
     },
 });

src/views/information/warehouse-info/list/normal-use/index.vue

@@ -30,7 +30,7 @@
     <!-- 停用仓库信息 -->
     <Disable />
     <!-- 仓库信息详情 -->
-    <Detail />
+    <Detail :selectedRow="selectedRow" />
     <!-- 修改仓息库信 -->
     <Modify />
   </div>

src/views/information/warehouse-info/setup.ts

@@ -0,0 +1,42 @@
+/**
+ * 仓库状态名称 - 1:正常 2:注销 3:待审核 4:审核拒绝
+ * @param status
+ */
+export function gerWareHouseStatusName(status: number): string{
+    let result : string = "--";
+    switch (status){
+        case 1:
+            result = "正常";
+            break
+        case 2:
+            result = "注销";
+            break
+        case 3:
+            result = "待审核";
+            break
+        case 4:
+            result = "审核拒绝";
+            break
+    }
+    return result
+}
+
+/**
+ * 仓库类型 - 1 厂库 2 自有库 3 合作库
+ * @param type
+ */
+export function getWareHouseTypeName(type: number): string{
+    let result : string = "--";
+    switch (type){
+        case 1:
+            result = "厂库";
+            break
+        case 2:
+            result = "自有库";
+            break
+        case 3:
+            result = "合作库";
+            break
+    }
+    return result
+}