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

src/views/business/purchase/components/storage/index.vue

@@ -60,7 +60,7 @@
                 <legend>本次入库信息</legend>
                 <a-row :gutter="24">
                     <a-col :span="12">
-                        <a-form-item label="品类">
+                        <a-form-item label="商品">
                             <a-select class="inlineFormSelect" style="width: 200px" placeholder="请选择品类" v-model:value="selectedRow.wrstandardid" readonly>
                                 <a-select-option v-for="option in gmlist" :key="option.wrstandardid" :value="option.wrstandardid">{{ option.wrstandardname }} </a-select-option>
                             </a-select>

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

@@ -74,6 +74,7 @@ export default defineComponent({
                     { label: '销售方', value: formatValue(data.sellusername) },
                     { label: '合同附件', value: formatValue(getImgName(data.attachment)) },
                     { label: '状态', value: getContractStatusName(data.contracctstatus), className: 'green' },
+                    { label: "交易主体",value:formatValue(data.subjectname)}
                 ];
                 getBaseInfo(base);
                 // 现货信息
@@ -81,7 +82,6 @@ export default defineComponent({
                     { label: '现货品种', value: formatValue(data.deliverygoodsname) },
                     { label: '商品', value: formatValue(data.wrstandardname) },
                     { label: '品牌', value: formatValue(data.brandname) },
-                    { label: '标仓系数', value: formatValue(data.convertfactor) },
                     { label: '商品规格', value: formatValue(data.spotgoodsdesc) },
                 ];
                 getSpotInfo(spot);

src/views/information/spot-contract/list/audit/index.vue

@@ -61,6 +61,7 @@ import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { getTableButton } from '@/common/setup/table/button';
 import { useRoute } from 'vue-router';
+import moment from "moment"
 
 export default defineComponent({
     name: EnumRouterName.spot_contract_checkpending,
@@ -84,7 +85,11 @@ export default defineComponent({
         const queryTableAction = () => {
             switch (routeName) {
                 case 'contract_checkpending':
-                    queryTable(QuerySpotContract, { querytype: 2 });
+                    queryTable(QuerySpotContract, { querytype: 2 }).then((res)=>{
+                        tableList.value.sort((a,b)=>{
+                            return moment(b.createtime).valueOf()-moment(a.createtime).valueOf()
+                        })
+                    })
                     break;
                 case 'contract_performance':
                     queryTable(QuerySpotContract, { querytype: 3 });

src/views/manage/business-review/list/someprice/index.vue

@@ -42,7 +42,7 @@ import { QueryBusinessDj } from '@/services/go/ermcp/business-review';
 import { QryBusinessDjRsp } from '@/services/go/ermcp/business-review/interface';
 import { useRoute } from 'vue-router';
 import moment from "moment"
-import { sortTime } from '@/utils/time'
+
 
 export default defineComponent({
     name: 'business-review-dj',