update

src/services/go/ermcp/spot-contract/interface.ts

@@ -2,7 +2,7 @@
  * 现货合同请求
  */
 export interface Ermcp3ContractReq {
-    querytype: number    //  查询类型 1-未提交 2-待审核 3-履约中 4-已完成
+    querytype: string    //  查询类型 1-未提交 2-待审核 3-履约中 4-已完成
     usertype?: number    //  用户类型 2-机构 7-企业成员
     contractid?: string  //  合同ID(SpotContractId)
     contracttype?: number  // 合同类型 1-采购, -1-销售

src/views/business/plan/components/cancel/index.vue

@@ -55,7 +55,7 @@
                     </a-col>
                     <a-col :span="12">
                         <a-form-item label="结算币种">
-                            <span class="white">{{ formatValue(selectedRow.enumdicname) }}</span>
+                            <span class="white">{{ formatValue(selectedRow.currencyname) }}</span>
                         </a-form-item>
                     </a-col>
                 </a-row>

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

@@ -39,7 +39,7 @@
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">
-                        <a-form-item label="合同暂定价">
+                        <a-form-item label="商品价格">
                             <span class="white">{{ formatValue(selectedRow.price) }}</span>
                         </a-form-item>
                     </a-col>

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

@@ -1,41 +1,41 @@
 <template>
-    <!-- 采购合同: 特点价合同-待交收合同-->
-    <div class="purchase-peddding" :loading="loading">
-        <filterCustomTable @search="updateColumn"></filterCustomTable>
-        <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
-            </template>
-            <template #pricedqty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #unsureqty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #qty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #unpricedqty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #unpayamount="{ record }">
-                <span>{{ record.unpayamount.toFixed(2) }}</span>
-            </template>
-            <template #daikaiamount="{ record }">
-                <span>{{ record.daikaiamount.toFixed(2) }}</span>
-            </template>
-            <template #deliverystartdate,deliveryenddate="{ record }">
-                <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
-            </template>
-            <template #startdate,enddate="{ record }">
-                <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
+  <!-- 采购合同: 特点价合同-待交收合同-->
+  <div class="purchase-peddding" :loading="loading">
+    <filterCustomTable @search="updateColumn"></filterCustomTable>
+    <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
+      </template>
+      <template #pricedqty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #unsureqty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #qty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #unpricedqty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #unpayamount="{ record }">
+        <span>{{ record.unpayamount.toFixed(2) }}</span>
+      </template>
+      <template #daikaiamount="{ record }">
+        <span>{{ record.daikaiamount.toFixed(2) }}</span>
+      </template>
+      <template #deliverystartdate,deliveryenddate="{ record }">
+        <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
+      </template>
+      <template #startdate,enddate="{ record }">
+        <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">

src/views/business/search/plan/index.vue

@@ -31,7 +31,7 @@ export default defineComponent({
         const { loading, tableList, queryTable } = queryTableList<Ermcp3HedgePlan>();
 
         // 获取列表数据
-        const queryTableAction = () => queryTable(QueryHedgePlan, '0,1,2,3,4,5,6');
+        const queryTableAction = () => queryTable(QueryHedgePlan, '2,3');
 
         // 表格通用逻辑
         const param: ComposeTableParam = {

src/views/business/sell/components/settlement/index.vue

@@ -39,7 +39,7 @@
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">
-                        <a-form-item label="合同暂定价">
+                        <a-form-item label="商品价格">
                             <span class="white">{{ formatValue(selectedRow.price) }}</span>
                         </a-form-item>
                     </a-col>

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

@@ -1,27 +1,12 @@
 <template>
-  <!-- 删除现货合同--->
-  <a-modal class="recover-custom commonModal addSpotVariety"
-           title="删除现货合同"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                :loading="loading"
-                :disabled="loading"
-                @click="cancel">取消</a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                :disabled="loading"
-                @click="submit">确认删除</a-button>
-    </template>
-    <InfoDetail :selectedRow="selectedRow" />
-
-  </a-modal>
+    <!-- 删除现货合同--->
+    <a-modal class="recover-custom commonModal addSpotVariety" title="撤销现货合同" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
+        <template #footer>
+            <a-button key="submit" class="cancelBtn" :loading="loading" :disabled="loading" @click="cancel">取消</a-button>
+            <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit">确认撤销</a-button>
+        </template>
+        <InfoDetail :selectedRow="selectedRow" />
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -52,8 +37,8 @@ export default defineComponent({
         // 获取 业务账户
         function submit() {
             Modal.confirm({
-                title: '是否确认删除',
-                okText: '确认删除',
+                title: '是否确认撤销',
+                okText: '确认撤销',
                 cancelText: '取消',
                 onOk() {
                     let params: GldErmcpSpotContractOperateReq = {
@@ -81,10 +66,4 @@ export default defineComponent({
         };
     },
 });
-</script>
-
-<style lang="less">
-.recover-custom {
-}
-</style
->;
+</script>

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

@@ -17,15 +17,6 @@ export default defineComponent({
         const select: SelectList[] = [
             {
                 value: undefined,
-                key: 'contracttype',
-                placeholder: '全部合同类型',
-                list: [
-                    { value: 1, lable: '采购' },
-                    { value: -1, lable: '销售' },
-                ],
-            },
-            {
-                value: undefined,
                 key: 'pricetype',
                 placeholder: '全部定价类型',
                 list: [

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

@@ -1,56 +1,56 @@
 <template>
-    <!-- 采购合同: 新增合同-已完结合同-->
-    <div class="spot-contract-not-commit" :loading="loading">
-        <filterCustomTable @search="updateColumn">
-            <mtp-table-button :buttons="firstBtn" @click="openComponent" />
-        </filterCustomTable>
-        <a-table :columns="columns" class="srcollYTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
-            <!-- 额外的展开行 -->
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="secondBtn" :record="record" @click="openComponent" />
-            </template>
-            <template #biztype="{ text }">
-                <a>{{ getBizTypeName(text) }}</a>
-            </template>
-            <template #pricetype="{ text }">
-                <span>{{ getPriceTypeName(text) }}</span>
-            </template>
-            <template #contracctstatus="{ text }">
-                <a>{{ getContractStatusName(text) }}</a>
-            </template>
-            <template #contracttype="{ text }">
-                <a>{{ getContractTypeName(text) }}</a>
-            </template>
-            <!-- 对手方 -->
-            <template #negative="{ record }">
-                <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
-            </template>
-            <!-- 点假期 -->
-            <template #startdate="{ record }">
-                <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
-            </template>
-            <!-- 交收期 -->
-            <template #deliverystartdate="{ record }">
-                <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
-            </template>
-            <!-- 业务员 -->
-            <template #saleuserid="{ record }">
-                <span>{{ findManagerName(record.saleuserid) }}</span>
-            </template>
-            <!-- 跟单员 -->
-            <template #meruserid="{ record }">
-                <span>{{ findManagerName(record.meruserid) }}</span>
-            </template>
-            <!-- 合同量 -->
-            <template #qty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
+  <!-- 采购合同: 新增合同-已完结合同-->
+  <div class="spot-contract-not-commit" :loading="loading">
+    <filterCustomTable @search="updateColumn">
+      <mtp-table-button :buttons="firstBtn" @click="openComponent" />
+    </filterCustomTable>
+    <a-table :columns="columns" class="srcollYTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+      <!-- 额外的展开行 -->
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="secondBtn" :record="record" @click="openComponent" />
+      </template>
+      <template #biztype="{ text }">
+        <a>{{ getBizTypeName(text) }}</a>
+      </template>
+      <template #pricetype="{ text }">
+        <span>{{ getPriceTypeName(text) }}</span>
+      </template>
+      <template #contracctstatus="{ text }">
+        <a>{{ getContractStatusName(text) }}</a>
+      </template>
+      <template #contracttype="{ text }">
+        <a>{{ getContractTypeName(text) }}</a>
+      </template>
+      <!-- 对手方 -->
+      <template #negative="{ record }">
+        <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
+      </template>
+      <!-- 点假期 -->
+      <template #startdate="{ record }">
+        <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
+      </template>
+      <!-- 交收期 -->
+      <template #deliverystartdate="{ record }">
+        <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
+      </template>
+      <!-- 业务员 -->
+      <template #saleuserid="{ record }">
+        <span>{{ findManagerName(record.saleuserid) }}</span>
+      </template>
+      <!-- 跟单员 -->
+      <template #meruserid="{ record }">
+        <span>{{ findManagerName(record.meruserid) }}</span>
+      </template>
+      <!-- 合同量 -->
+      <template #qty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">
@@ -89,23 +89,32 @@ export default defineComponent({
             switch (routeName) {
                 // 新增合同
                 case 'purchase_contract':
-                    queryTable(QuerySpotContract, { contracttype: 1 });
+                    queryTable(QuerySpotContract, { contracttype: 1, querytype: '1,2' });
                     break;
                 // 已完结合同
                 case 'purchase_finish':
-                    queryTable(QuerySpotContract, { contracttype: 1, querytype: 4 });
+                    queryTable(QuerySpotContract, { contracttype: 1, querytype: '4' });
                     break;
             }
             // 获取 业务账户
             queryBusinessManager();
         };
 
+        // function handleButton(item: Ermcp3ContractRsp) {
+        //     const { contracctstatus } = item;
+        //     if (['']) {
+        //         return btnList;
+        //     } else {
+        //         return btnList.filter((e) => e.code === 'detail');
+        //     }
+        // }
+
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
             menuType: EnumRouterName.spot_contract_unsubmitted,
             tableName: 'table_pcweb_delivery',
-            tableFilterKey: ['contracttype', 'pricetype', 'contractno'],
+            tableFilterKey: ['pricetype', 'contractno'],
             tableFilterCB,
             isDetail: true,
         };

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

@@ -89,11 +89,11 @@ export default defineComponent({
             switch (routeName) {
                 // 新增合同
                 case 'sell_contract':
-                    queryTable(QuerySpotContract, { contracttype: -1, querytype: 1 });
+                    queryTable(QuerySpotContract, { contracttype: -1, querytype: '1,2' });
                     break;
                 // 已完结合同
                 case 'sell_finish':
-                    queryTable(QuerySpotContract, { contracttype: -1, querytype: 4 });
+                    queryTable(QuerySpotContract, { contracttype: -1, querytype: '4' });
                     break;
             }
             // 获取 业务账户

src/views/information/spot-contract/list/setup.ts

@@ -6,7 +6,7 @@ import { message } from 'ant-design-vue';
 import { ref } from 'vue';
 
 // 1-未提交 2-待审核 3-履约中 4-已完成
-type EnumType = 1 | 2 | 3 | 4;
+type EnumType = '1' | '2' | '3' | '4';
 
 /**
  * 获取表格列表数据

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

@@ -69,7 +69,7 @@ export default defineComponent({
                     queryTable(QueryBusinessDj, { applystatus: '1' });
                     break;
                 case 'someprice_performance':
-                    queryTable(QueryBusinessDj, { applystatus: '2' });
+                    queryTable(QueryBusinessDj, { applystatus: '2,3' });
                     break;
             }
         };