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

public/config/app.config.json

@@ -1,3 +1,3 @@
 {
     "apiUrl": "http://192.168.31.203:8080/cfg?key=test_203"
-}
+}

src/views/business/purchase/list/all/index.vue

@@ -10,6 +10,9 @@
       <template #pricedqty="{ text, record }">
         <span>{{ handleEnumdic(text, record) }}</span>
       </template>
+      <template #accountname="{ record}">
+        {{record.nickname}}
+      </template>
       <template #unsureqty="{ text, record }">
         <span>{{ handleEnumdic(text, record) }}</span>
       </template>

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

@@ -311,7 +311,7 @@ export default defineComponent({
         // 交易主体列表
         const subjectList = ref<Ermcp3SubjectRsp[]>([]);
         QueryPaAreaSubject().then((res) => {
-            subjectList.value = res;
+            subjectList.value = res.filter(item=>item.subjectstatus===1);
         });
 
         GetDeliveryGoodsDetail()

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

@@ -15,6 +15,7 @@
                     <!-- 审核通过'green' 审核拒绝 'orange' 待审核'yellow'   -->
                 </template>
 
+                <!-- 审核状态 -->
                 <template #applystatus="{ text }">
                     <a>{{ getApplyStatusName(text) }}</a>
                 </template>
@@ -63,6 +64,9 @@
                 <template #applyname="{ record }">
                     <span>{{ formatValue(record.applyname) }}</span>
                 </template>
+                <template #warehousename="{record}">
+                    {{record.warehousecode}}
+                </template>
 
                 <!-- 款项记录 款项类型为退款  则金额使用deductamount-->
             </a-table>