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

src/common/constants/enumsName.ts

@@ -774,6 +774,23 @@ export function getChannelBuildName(type: number) {
     return result
 }
 
+/**
+ * 发票类型  采购： 收票  销售： 开票
+ * @param type
+ */
+export function getReceiptName(type: number) {
+    let result = "--"
+    switch (type) {
+        case 1:
+            result = '收票'
+            break
+        case -1:
+            result = '开票'
+            break
+    }
+    return result
+}
+
 
 /**
  * 资金操作类型

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

@@ -88,14 +88,14 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="销售方">
-                <span class="white">{{getUserName()}}</span>
+                <span class="white">{{getRootUserInfo().accountname}}</span>
               </a-form-item>
             </a-col>
           </template>
           <template v-else>
             <a-col :span="12">
               <a-form-item label="采购方">
-                <span class="white">{{getUserName()}}</span>
+                <span class="white">{{getRootUserInfo().accountname}}</span>
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -426,7 +426,7 @@
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import { addContractReq } from './setup';
-import { getAreaUserName, getUserName, getUsrId } from '@/services/bus/user';
+import {getAreaUserName, getRootUserInfo, getUserName, getUsrId} from '@/services/bus/user';
 import { getGoodsList } from '@/services/bus/goods';
 import { Goods } from '@/services/go/ermcp/goodsInfo/interface';
 import { FormState } from '../interface';
@@ -563,6 +563,7 @@ export default defineComponent({
             businesserList,
             merchandiserList,
             uploadImgAction,
+            getRootUserInfo,
         };
     },
 });

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

@@ -43,7 +43,7 @@
 
         <!-- 发票类型-->
         <template #contracttype="{ text }">
-          <a>{{ getPlanContractType(text) }}</a>
+          <a>{{ getReceiptName(text) }}</a>
         </template>
 
         <!-- 出入库类型 -->
@@ -97,7 +97,7 @@ import { QueryAreaStockApply } from '@/services/go/ermcp/inventory-review';
 import { QueryChangeLog } from '@/services/go/ermcp/spot-contract';
 import { ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
 import InfoDetail from '../infoDetail/index.vue';
-import { getApplyStatusName } from '@/common/constants/enumsName';
+import {getApplyStatusName, getReceiptName} from '@/common/constants/enumsName';
 import { getTableColumns } from '@/common/setup/table';
 import { invoiceStatusName } from '@/views/manage/finance-review/setup';
 import { getPlanContractType } from '@/views/business/plan/setup';
@@ -221,7 +221,8 @@ export default defineComponent({
             getPlanContractType,
             InOutTypeName,
             kxtypeName,
-            formatValue
+            formatValue,
+            getReceiptName
         };
     },
 });

src/views/manage/finance-review/setup.ts

@@ -54,7 +54,7 @@ export function kxtypeName(type: number): string {
     if (type === 1) {
         result = "付款"
     } else {
-        result = "退款"
+        result = "收款"
     }
 
     return result

src/views/report/spot-report/list/spot_report/index.vue

@@ -41,7 +41,6 @@
       <template #curmarketvalue="{ record }">
         <span>{{ record.curmarketvalue.toFixed(2) }}</span>
       </template>
-
     </a-table>
     <!-- 明细 -->
     <Description v-if="visible"
@@ -54,6 +53,18 @@
                rowKey="key"
                :data-source="detailTableList"
                :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+          <template #curaverageprice="{ record }">
+              <span>{{ record.curaverageprice.toFixed(2) }}</span>
+          </template>
+          <template #curspotprice="{ record }">
+              <span>{{ record.curspotprice.toFixed(2) }}</span>
+          </template>
+          <template #curmarketvalue="{ record }">
+              <span>{{ record.curmarketvalue.toFixed(2) }}</span>
+          </template>
+          <template #floatpl="{ record }">
+              <span>{{ record.floatpl.toFixed(2) }}</span>
+          </template>
       </a-table>
     </Description>
   </div>