commit 修改bug

src/services/proto/contract/index.ts

@@ -27,7 +27,6 @@ export const contractOperateApply = (param: ContractOperateApplyReq): Promise<an
     const obj = {
         OperateSrc: 2,
         OperatorID: Number(getLongTypeLoginID()),
-        OperateApplyID: getTimeValue()
     }
     Object.assign(param, obj)
     return protoMiddleware<ContractOperateApplyReq>(param, 'ContractOperateApplyReq', 'ContractOperateApplyRsp', 2)

src/views/manage/business-review/components/settlementAudit/index.vue

@@ -13,11 +13,13 @@
                 :loading="loading"
                 @click="submit">关闭</a-button>
       <a-button key="submit"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 type="primary"
                 :loading="loading"
                 @click="pass">审核通过
       </a-button>
       <a-button key="submit"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 type="primary"
                 :loading="loading"
                 @click="refuse">审核拒绝
@@ -109,6 +111,7 @@ import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
 import Long from 'long';
 import { somePriceControl } from '@/views/manage/business-review/components/setup';
 import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import {isShowContractCheck} from "@/views/manage/inventory-review/setup";
 
 export default defineComponent({
     name: 'business_review_settlement_audit',
@@ -165,7 +168,10 @@ export default defineComponent({
                         OperateType: 3,
                     };
                     somePriceControl(param, loading)
-                        .then((res) => [context.emit('refresh'), cancel()])
+                        .then((res) => {
+                            context.emit('refresh')
+                            cancel()
+                        })
                         .catch((err) => {});
                 },
                 onCancel() {
@@ -185,6 +191,7 @@ export default defineComponent({
             refuse,
             getPriceTypeName,
             getContractTypeName,
+            isShowContractCheck,
         };
     },
 });

src/views/manage/business-review/components/somepriceAudit/index.vue

@@ -13,12 +13,15 @@
                 :loading="loading"
                 @click="cancel">关闭
       </a-button>
-      <a-button key="submit"
+      <a-button
+                v-if="isShowContractCheck(selectedRow.applystatus)"
+                key="submit"
                 type="primary"
                 :loading="loading"
                 @click="pass">审核通过
       </a-button>
       <a-button key="submit"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 type="primary"
                 :loading="loading"
                 @click="refuse">审核拒绝
@@ -116,6 +119,7 @@ import { somePriceControl } from '@/views/manage/business-review/components/setu
 import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
 import * as Long from 'long';
 import { QryBusinessDjRsp } from '@/services/go/ermcp/business-review/interface';
+import {isShowContractCheck} from "@/views/manage/inventory-review/setup";
 
 export default defineComponent({
     name: 'business_review_someprice_audit',
@@ -163,6 +167,7 @@ export default defineComponent({
                     const param: ContractOperateApplyReq = {
                         OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
                         OperateType: 3,
+                        Remark: '',
                     };
                     somePriceControl(param, loading)
                         .then((res) => {
@@ -176,7 +181,6 @@ export default defineComponent({
                 },
             });
         }
-
         return {
             visible,
             cancel,
@@ -187,6 +191,7 @@ export default defineComponent({
             getStatusName,
             maskClosableFlag,
             getPriceTypeName,
+            isShowContractCheck,
         };
     },
 });

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

@@ -37,7 +37,6 @@
         <template #buyusernameOrsellusername="{ record }">
           <a>{{ getAnalogueName(record.contracttype, record.buyusername, record.sellusername) }}</a>
         </template>
-
       </a-table>
     </contextMenu>
     <!-- 点价记录详情 -->
@@ -88,7 +87,7 @@ export default defineComponent({
             registerColumn('table_pcweb_business_aduit_dj', ['contracttype', 'contractno', 'deliverygoodsname'], (e: Column, item: ColumnType, filtered: any) => {
                 if (e.columnfield === 'buyusernameOrsellusername') {
                     item.onFilter = (value: string, record: QryBusinessDjRsp) => {
-                        const { contracttype, buyusername, sellusername } = record;
+                        const { contracttype, buyusername, sellusername, applystatus } = record;
                         if (contracttype === 1) {
                             // 采购
                             return sellusername.includes(value);

src/views/manage/finance-review/components/fundsAudit/index.vue

@@ -15,11 +15,13 @@
       </a-button>
       <a-button key="submit"
                 type="primary"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 :loading="loading"
                 @click="pass">审核通过
       </a-button>
       <a-button key="submit"
                 type="primary"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 :loading="loading"
                 @click="refuse">审核拒绝
       </a-button>
@@ -98,6 +100,7 @@ import { financeControl } from '@/views/manage/finance-review/components/setup';
 import {kxtypeName, stateName} from "@/views/manage/finance-review/setup";
 import {getContractTypeName} from "@/views/information/spot-contract/setup";
 import {getPriceTypeName} from "@/views/business/purchase/setup";
+import {isShowContractCheck} from "@/views/manage/inventory-review/setup";
 
 export default defineComponent({
     name: 'finance_review_funds_audit',
@@ -179,6 +182,7 @@ export default defineComponent({
             getContractTypeName,
             maskClosableFlag,
             stateName,
+            isShowContractCheck,
         };
     },
 });

src/views/manage/finance-review/components/invoiceAudit/index.vue

@@ -15,11 +15,13 @@
             </a-button>
             <a-button key="submit"
                       type="primary"
+                      v-if="isShowContractCheck(selectedRow.applystatus)"
                       :loading="loading"
                       @click="pass">审核通过
             </a-button>
             <a-button key="submit"
                       type="primary"
+                      v-if="isShowContractCheck(selectedRow.applystatus)"
                       :loading="loading"
                       @click="refuse">审核拒绝
             </a-button>
@@ -105,6 +107,7 @@ import {ContractOperateApplyReq} from '@/services/proto/contract/interface';
 import Long from 'long';
 import {somePriceControl} from '@/views/manage/business-review/components/setup';
 import {financeControl} from '@/views/manage/finance-review/components/setup';
+import {isShowContractCheck} from "@/views/manage/inventory-review/setup";
 
 export default defineComponent({
     name: 'finance_review_invoice_audit',
@@ -190,6 +193,7 @@ export default defineComponent({
             getPriceTypeName,
             pass,
             refuse,
+            isShowContractCheck,
         };
     },
 });

src/views/manage/inventory-review/components/checkinAudit/index.vue

@@ -16,11 +16,13 @@
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 @click="pass">审核通过
       </a-button>
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 @click="refuse">审核拒绝
       </a-button>
     </template>
@@ -154,7 +156,7 @@ import { mergeObj } from '@/utils/objHandle';
 import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
-import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
+import {InOutTypeName, isShowContractCheck, isShowContractInfo} from '@/views/manage/inventory-review/setup';
 import { getContractTypeName } from '@/views/information/spot-contract/setup';
 import { getPriceTypeName } from '@/views/business/purchase/setup';
 import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
@@ -253,7 +255,7 @@ export default defineComponent({
             InOutTypeName,
             getGoodsUnitEnumItemName,
             getApplyStatusName,
-
+            isShowContractCheck,
             refuse,
             pass,
         };

src/views/manage/inventory-review/components/checkoutAudit/index.vue

@@ -15,11 +15,13 @@
       </a-button>
       <a-button key="submit"
                 type="primary"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 :loading="loading"
                 @click="pass">审核通过
       </a-button>
       <a-button key="submit"
                 type="primary"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 :loading="loading"
                 @click="refuse">审核拒绝
       </a-button>
@@ -147,7 +149,7 @@ import { defineComponent, PropType, reactive, ref, watchEffect } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
-import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
+import {InOutTypeName, isShowContractCheck, isShowContractInfo} from '@/views/manage/inventory-review/setup';
 import { getContractTypeName } from '@/views/information/spot-contract/setup';
 import { getPriceTypeName } from '@/views/business/purchase/setup';
 import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
@@ -248,7 +250,7 @@ export default defineComponent({
             InOutTypeName,
             getGoodsUnitEnumItemName,
             getApplyStatusName,
-
+            isShowContractCheck,
             pass,
             refuse,
         };

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

@@ -31,6 +31,14 @@ export function isShowContractInfo(type: number): boolean{
     return (type === 5 || type === 6)
 }
 
+/**
+ * 是否显示审核按钮
+ * @param type
+ */
+export function isShowContractCheck(type: number): boolean{
+    return (type === 1)
+}
+
 // 提示
 export const inventorySign = new Map<number, ResultInfo>([
     [2, ['审核通过成功', '审核失败:']],