huangbin 4 năm trước cách đây
mục cha
commit
b2c1557de6
50 tập tin đã thay đổi với 257 bổ sung245 xóa
  1. 3 3
      src/views/business/plan/components/cancel/index.vue
  2. 1 1
      src/views/information/account_info/compoments/cancel-managers/index.vue
  3. 144 146
      src/views/information/account_info/compoments/credit-futures/index.vue
  4. 1 1
      src/views/information/account_info/compoments/detail-business/index.vue
  5. 1 1
      src/views/information/account_info/compoments/detail-managers/index.vue
  6. 1 1
      src/views/information/account_info/compoments/detail-trader/index.vue
  7. 1 1
      src/views/information/account_info/compoments/locked-managers/index.vue
  8. 1 1
      src/views/information/account_info/compoments/unlocked-managers/index.vue
  9. 1 1
      src/views/information/custom/compoments/detail/index.vue
  10. 1 1
      src/views/information/custom/compoments/disable/index.vue
  11. 1 1
      src/views/information/custom/compoments/modify/index.vue
  12. 1 1
      src/views/information/goods/components/add/index.vue
  13. 1 1
      src/views/information/goods/components/disable/index.vue
  14. 14 12
      src/views/information/goods/components/hedgingDetail/index.vue
  15. 2 2
      src/views/information/goods/components/hedgingModify/index.vue
  16. 1 1
      src/views/information/goods/components/modify/index.vue
  17. 2 2
      src/views/information/goods/components/spotDetail/index.vue
  18. 1 1
      src/views/information/spot-contract/components/add/index.vue
  19. 1 1
      src/views/information/spot-contract/components/cancel/index.vue
  20. 1 1
      src/views/information/spot-contract/components/check/index.vue
  21. 1 1
      src/views/information/spot-contract/components/delete/index.vue
  22. 20 18
      src/views/information/spot-contract/components/detail/index.vue
  23. 1 1
      src/views/information/spot-contract/components/finish/index.vue
  24. 1 1
      src/views/information/warehouse-info/compoments/add/index.vue
  25. 5 5
      src/views/information/warehouse-info/compoments/detail/index.vue
  26. 1 1
      src/views/information/warehouse-info/compoments/disable/index.vue
  27. 1 1
      src/views/information/warehouse-info/compoments/modify/index.vue
  28. 1 1
      src/views/information/warehouse-info/compoments/recover/index.vue
  29. 1 1
      src/views/manage/business-review/components/settlementAudit/index.vue
  30. 1 1
      src/views/manage/business-review/components/settlementCancel/index.vue
  31. 1 1
      src/views/manage/business-review/components/settlementDetail/index.vue
  32. 1 1
      src/views/manage/business-review/components/somepriceAudit/index.vue
  33. 1 1
      src/views/manage/business-review/components/somepriceCancel/index.vue
  34. 1 1
      src/views/manage/business-review/components/somepriceDetail/index.vue
  35. 1 1
      src/views/manage/finance-review/components/fundsAudit/index.vue
  36. 1 1
      src/views/manage/finance-review/components/fundsCancel/index.vue
  37. 1 1
      src/views/manage/finance-review/components/fundsDetail/index.vue
  38. 1 1
      src/views/manage/finance-review/components/invoiceAudit/index.vue
  39. 1 1
      src/views/manage/finance-review/components/invoiceCancel/index.vue
  40. 1 1
      src/views/manage/finance-review/components/invoiceDetail/index.vue
  41. 1 1
      src/views/manage/inventory-review/components/checkinAudit/index.vue
  42. 1 1
      src/views/manage/inventory-review/components/checkinCancel/index.vue
  43. 1 1
      src/views/manage/inventory-review/components/checkinDetail/index.vue
  44. 1 1
      src/views/manage/inventory-review/components/checkoutAudit/index.vue
  45. 1 1
      src/views/manage/inventory-review/components/checkoutCancel/index.vue
  46. 1 1
      src/views/manage/inventory-review/components/checkoutDetail/index.vue
  47. 1 1
      src/views/platinum/platinum_customer_info/compoments/check/index.vue
  48. 2 2
      src/views/platinum/platinum_customer_info/compoments/detail/index.vue
  49. 1 1
      src/views/platinum/platinum_customer_info/compoments/disable/index.vue
  50. 24 14
      src/views/search/inventory/components/add/index.vue

+ 3 - 3
src/views/business/plan/components/cancel/index.vue

@@ -4,7 +4,7 @@
            title="计划撤销"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>
@@ -70,7 +70,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="结算币种">
-                <span class="white">{{ formatValue(getPayCurrencyTypeEnumList().find(item => item.enumdicid === selectedRow.currencyid).enumdicname) }}</span>
+              <span class="white">{{ formatValue(getPayCurrencyTypeEnumList().find(item => item.enumdicid === selectedRow.currencyid).enumdicname) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -97,7 +97,7 @@ import { HedgePlanOperateReq } from '@/services/proto/hedgeplan/interface';
 import * as Long from 'long';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { oldHedgePlanReq } from '@/services/proto/hedgeplan';
-import {getPayCurrencyTypeEnumList} from "@/common/constants/enumsList";
+import { getPayCurrencyTypeEnumList } from '@/common/constants/enumsList';
 
 export default defineComponent({
     name: 'plan_audit_cancel',

+ 1 - 1
src/views/information/account_info/compoments/cancel-managers/index.vue

@@ -4,7 +4,7 @@
            title="管理员账号注销"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 144 - 146
src/views/information/account_info/compoments/credit-futures/index.vue

@@ -1,161 +1,159 @@
 <template>
-    <!-- 授信-->
-    <a-modal class="add-custom custom-detail"
-             title="授信"
-             v-model:visible="visible"
-             centered
-             :maskClosable="maskClosableFlag"
-             @cancel="cancel"
-             width="890px">
-        <template #footer>
-            <a-button key="submit"
-                      type="primary"
-                      :loading="loading"
-                      @click="cancel">取消
-            </a-button>
-            <a-button key="submit"
-                      type="primary"
-                      :loading="loading"
-                      @click="submit">授信
-            </a-button>
-        </template>
-        <a-form class="inlineForm">
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="账户名称"
-                                 name="userid">
-                        <span class="white">{{secondeData.accountname}}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="资金账号"
-                                 name="">
-                        <span class="white">{{secondeData.accountid}}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="授信总额"
-                                 name="">
-                        <span class="white"> {{mortgagecredit}}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="子账户当前余额"
-                                 name="">
-                        <span class="white">{{currentbalance}}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="授信金额"
-                                 class="relative"
-                                 name="">
-                        <a-input class="dialogInput"
-                                 style="width: 200px"
-                                 v-model:value="money"
-                                 placeholder="请输入授信金额"></a-input>
-                        <div class="tip">正数为增加,负数为减少</div>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
+  <!-- 授信-->
+  <a-modal class="add-custom custom-detail"
+           title="授信"
+           v-model:visible="visible"
+           centered
+           :maskClosable="false"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="cancel">取消
+      </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">授信
+      </a-button>
+    </template>
+    <a-form class="inlineForm">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="账户名称"
+                       name="userid">
+            <span class="white">{{secondeData.accountname}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="资金账号"
+                       name="">
+            <span class="white">{{secondeData.accountid}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="授信总额"
+                       name="">
+            <span class="white"> {{mortgagecredit}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="子账户当前余额"
+                       name="">
+            <span class="white">{{currentbalance}}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="授信金额"
+                       class="relative"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     v-model:value="money"
+                     placeholder="请输入授信金额"></a-input>
+            <div class="tip">正数为增加,负数为减少</div>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
-    import {defineComponent, PropType, ref, toRaw, watchEffect} from 'vue';
-    import {closeModal} from '@/common/setup/modal/index';
-    import {ErmcpLoginUser, ErmcpTaAccount, ErmcpTaAccountEx} from '@/services/go/ermcp/account/interface';
-    import {message, Modal} from 'ant-design-vue';
-    import {requestResultLoadingAndInfo} from '@/common/methods/request/resultInfo';
-    import {LoginaccountOperateReq, TaaccountTransfersxmoneyReq} from '@/services/proto/accountinfo/interface';
-    import {loginAccountOperate, taAccountTransfersXMoneyReq} from '@/services/proto/accountinfo';
-    import {getLongTypeLoginID} from "@/services/bus/login";
-    import {QueryAccMgrTaAccountInfo} from '@/services/go/ermcp/account';
-    import {getUserId} from '@/services/bus/account';
+import { defineComponent, PropType, ref, toRaw, watchEffect } from 'vue';
+import { closeModal } from '@/common/setup/modal/index';
+import { ErmcpLoginUser, ErmcpTaAccount, ErmcpTaAccountEx } from '@/services/go/ermcp/account/interface';
+import { message, Modal } from 'ant-design-vue';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { LoginaccountOperateReq, TaaccountTransfersxmoneyReq } from '@/services/proto/accountinfo/interface';
+import { loginAccountOperate, taAccountTransfersXMoneyReq } from '@/services/proto/accountinfo';
+import { getLongTypeLoginID } from '@/services/bus/login';
+import { QueryAccMgrTaAccountInfo } from '@/services/go/ermcp/account';
+import { getUserId } from '@/services/bus/account';
 
-    export default defineComponent({
-        name: 'account_info_futures_btn_child_credit',
-        components: {},
-        props: {
-            selectedData: {
-                type: Object as PropType<ErmcpTaAccount>,
-                default: {},
-            },
-            secondeData: {
-                default: {},
-                type: Object as PropType<ErmcpTaAccount>,
-            },
+export default defineComponent({
+    name: 'account_info_futures_btn_child_credit',
+    components: {},
+    props: {
+        selectedData: {
+            type: Object as PropType<ErmcpTaAccount>,
+            default: {},
         },
-        setup(props, context) {
-            const {visible, cancel} = closeModal('account_info_futures_btn_child_credit');
-            const loading = ref<boolean>(false);
-            // 当前余额
-            const currentbalance = ref<number>(0)
-            // 授信总额
-            const mortgagecredit = ref<number>(0)
-            const money = ref<number | null>(null)
-            watchEffect(() => {
-                if (visible.value && props.secondeData?.accountid) {
-                    const param = {
-                        userid: getUserId(),
-                        accountid: props.secondeData.accountid
+        secondeData: {
+            default: {},
+            type: Object as PropType<ErmcpTaAccount>,
+        },
+    },
+    setup(props, context) {
+        const { visible, cancel } = closeModal('account_info_futures_btn_child_credit');
+        const loading = ref<boolean>(false);
+        // 当前余额
+        const currentbalance = ref<number>(0);
+        // 授信总额
+        const mortgagecredit = ref<number>(0);
+        const money = ref<number | null>(null);
+        watchEffect(() => {
+            if (visible.value && props.secondeData?.accountid) {
+                const param = {
+                    userid: getUserId(),
+                    accountid: props.secondeData.accountid,
+                };
+                QueryAccMgrTaAccountInfo(param).then((res) => {
+                    console.log(res);
+                    if (res.length) {
+                        currentbalance.value = res[0].currentbalance;
+                        mortgagecredit.value = res[0].mortgagecredit;
                     }
-                    QueryAccMgrTaAccountInfo(param).then(res => {
-                        console.log(res);
-                        if (res.length) {
-                            currentbalance.value = res[0].currentbalance
-                            mortgagecredit.value = res[0].mortgagecredit
-                        }
-                    })
-                }
-            })
-
-            function submit() {
-                Modal.confirm({
-                    title: '是否确认授信账户',
-                    okText: '确认授信',
-                    cancelText: '取消',
-                    onOk() {
-                        const param = toRaw(money)
-                        if (param) {
-                            let reqParam: TaaccountTransfersxmoneyReq = {
-                                accountid: props.secondeData.accountid, // uint64 期货账户ID
-                                sxmoney: Number(param.value as number),// double 授信金额正为加负为减
-                                modifierid: Number(getLongTypeLoginID()),// uint64 修改人
-                                areauserid: Number(props.secondeData.relateduserid),// uint64 机构用户ID
-                            };
-                            requestResultLoadingAndInfo(taAccountTransfersXMoneyReq, reqParam, loading, ['账户授信成功', '账户授信失败:']).then(() => {
-                                cancel();
-                                context.emit('refresh');
-                            });
-                        } else {
-                            message.error('请输入授信金额')
-                        }
-
-                    },
-                    onCancel() {
-                    },
                 });
             }
+        });
 
-            return {
-                visible,
-                cancel,
-                maskClosableFlag: false,
-                submit,
-                loading,
-                currentbalance,
-                mortgagecredit,
-                money,
-            };
-        },
-    });
+        function submit() {
+            Modal.confirm({
+                title: '是否确认授信账户',
+                okText: '确认授信',
+                cancelText: '取消',
+                onOk() {
+                    const param = toRaw(money);
+                    if (param) {
+                        let reqParam: TaaccountTransfersxmoneyReq = {
+                            accountid: props.secondeData.accountid, // uint64 期货账户ID
+                            sxmoney: Number(param.value as number), // double 授信金额正为加负为减
+                            modifierid: Number(getLongTypeLoginID()), // uint64 修改人
+                            areauserid: Number(props.secondeData.relateduserid), // uint64 机构用户ID
+                        };
+                        requestResultLoadingAndInfo(taAccountTransfersXMoneyReq, reqParam, loading, ['账户授信成功', '账户授信失败:']).then(() => {
+                            cancel();
+                            context.emit('refresh');
+                        });
+                    } else {
+                        message.error('请输入授信金额');
+                    }
+                },
+                onCancel() {},
+            });
+        }
+
+        return {
+            visible,
+            cancel,
+            maskClosableFlag: false,
+            submit,
+            loading,
+            currentbalance,
+            mortgagecredit,
+            money,
+        };
+    },
+});
 </script>
 
 <style lang="less">
-    .custom-detail {
-        .ant-form.inlineForm {
-            margin-top: 20px;
-        }
+.custom-detail {
+    .ant-form.inlineForm {
+        margin-top: 20px;
     }
+}
 </style>;

+ 1 - 1
src/views/information/account_info/compoments/detail-business/index.vue

@@ -4,7 +4,7 @@
            title="账户明细"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/information/account_info/compoments/detail-managers/index.vue

@@ -4,7 +4,7 @@
            title="账号详情"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/information/account_info/compoments/detail-trader/index.vue

@@ -4,7 +4,7 @@
            title="交易账号详情"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/information/account_info/compoments/locked-managers/index.vue

@@ -4,7 +4,7 @@
            title="管理员账号锁定"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/information/account_info/compoments/unlocked-managers/index.vue

@@ -4,7 +4,7 @@
            title="管理员账号解锁"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/information/custom/compoments/detail/index.vue

@@ -4,7 +4,7 @@
            title="客户资料详情"
            centered
            v-model:visible="visible"
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/information/custom/compoments/disable/index.vue

@@ -4,7 +4,7 @@
            title="停用客户资料"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/information/custom/compoments/modify/index.vue

@@ -5,7 +5,7 @@
            v-if="visible"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/information/goods/components/add/index.vue

@@ -6,7 +6,7 @@
            v-model:visible="visible"
            @cancel="closeAction"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            width="850px">
     <template #footer>
       <a-button key="submit"

+ 1 - 1
src/views/information/goods/components/disable/index.vue

@@ -4,7 +4,7 @@
            title="停用现货品种"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 14 - 12
src/views/information/goods/components/hedgingDetail/index.vue

@@ -5,7 +5,7 @@
            v-if="visible"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
 
@@ -69,7 +69,8 @@
                class="dialogRowTitle"
                v-for="(item, index) in list"
                :key="index">
-          <a-col :span="5" class="nowrap">
+          <a-col :span="5"
+                 class="nowrap">
             <span class="white">
               {{item.updatetime}}
             </span>
@@ -84,7 +85,8 @@
               {{item.aftervalue}}
             </span>
           </a-col>
-          <a-col :span="5" class="ellipse">
+          <a-col :span="5"
+                 class="ellipse">
             <span class="white">
               {{item.logremark}}
             </span>
@@ -148,15 +150,15 @@ export default defineComponent({
 
 <style lang="less">
 .hedgingDetail {
-  .ellipse {
-    white-space: nowrap;
-    overflow: hidden;
-    width: 20%;
-    text-overflow: ellipsis;
-  }
-  .nowrap {
-    white-space: nowrap;
-  }
+    .ellipse {
+        white-space: nowrap;
+        overflow: hidden;
+        width: 20%;
+        text-overflow: ellipsis;
+    }
+    .nowrap {
+        white-space: nowrap;
+    }
 }
 </style
 >;

+ 2 - 2
src/views/information/goods/components/hedgingModify/index.vue

@@ -6,7 +6,7 @@
            v-model:visible="visible"
            :loading="loading"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>
@@ -47,7 +47,7 @@
                                 type="number"
                                 placeholder="请输入套保比例"
                                 v-model:value="formState.needhedgeratio" />
-                                <div class="backUnit">%</div>
+                <div class="backUnit">%</div>
               </a-form-item>
             </a-col>
           </a-row>

+ 1 - 1
src/views/information/goods/components/modify/index.vue

@@ -5,7 +5,7 @@
            v-if="visible"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 2 - 2
src/views/information/goods/components/spotDetail/index.vue

@@ -5,7 +5,7 @@
            v-if="visible"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>
@@ -153,7 +153,7 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { formatValue, initData } from '@/common/methods/index';
 import { ErmcpDeliveryGoodsDetailEx } from '@/services/go/ermcp/goodsInfo/interface';
-import {getValidName} from "@/common/constants/enumsName";
+import { getValidName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'spot-detail',

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

@@ -4,7 +4,7 @@
            title="新增现货合同"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="closeAction"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/information/spot-contract/components/cancel/index.vue

@@ -4,7 +4,7 @@
            title="现货合同撤销"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/information/spot-contract/components/check/index.vue

@@ -4,7 +4,7 @@
            title="现货合同审核"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

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

@@ -4,7 +4,7 @@
            title="删除现货合同"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

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

@@ -4,7 +4,7 @@
            title="现货合同详情"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>
@@ -107,23 +107,25 @@ export default defineComponent({
 
                 tabList.value = [0, 4, 6].includes(props.selectedRow.contracctstatus)
                     ? [{ key: 1, name: '合同详情' }]
-                    : (props.selectedRow.contracttype === 1 ? [
-                        { key: 1, name: '合同详情' },
-                        { key: 2, name: '点价记录' },
-                        { key: 3, name: '交收记录' },
-                        { key: 4, name: '款项记录' },
-                        { key: 5, name: '发票记录' },
-                        { key: 6, name: '入库记录' },
-                        { key: 8, name: '变更记录' },
-                    ]:[
-                        { key: 1, name: '合同详情' },
-                        { key: 2, name: '点价记录' },
-                        { key: 3, name: '交收记录' },
-                        { key: 4, name: '款项记录' },
-                        { key: 5, name: '发票记录' },
-                        { key: 7, name: '出库记录' },
-                        { key: 8, name: '变更记录' },
-                    ]);
+                    : props.selectedRow.contracttype === 1
+                    ? [
+                          { key: 1, name: '合同详情' },
+                          { key: 2, name: '点价记录' },
+                          { key: 3, name: '交收记录' },
+                          { key: 4, name: '款项记录' },
+                          { key: 5, name: '发票记录' },
+                          { key: 6, name: '入库记录' },
+                          { key: 8, name: '变更记录' },
+                      ]
+                    : [
+                          { key: 1, name: '合同详情' },
+                          { key: 2, name: '点价记录' },
+                          { key: 3, name: '交收记录' },
+                          { key: 4, name: '款项记录' },
+                          { key: 5, name: '发票记录' },
+                          { key: 7, name: '出库记录' },
+                          { key: 8, name: '变更记录' },
+                      ];
                 activeKey.value = 1;
             }
         });

+ 1 - 1
src/views/information/spot-contract/components/finish/index.vue

@@ -4,7 +4,7 @@
            title="现货合同正常完结"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/information/warehouse-info/compoments/add/index.vue

@@ -4,7 +4,7 @@
            title="新增仓库信息"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 5 - 5
src/views/information/warehouse-info/compoments/detail/index.vue

@@ -4,7 +4,7 @@
            title="仓库信息详情"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>
@@ -73,9 +73,9 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { ErmcpWareHouseInfo } from '@/services/go/ermcp/warehouse-info/interface';
-import {gerWareHouseStatusName, getAddressInfo, getWareHouseTypeName} from '@/views/information/warehouse-info/setup';
+import { gerWareHouseStatusName, getAddressInfo, getWareHouseTypeName } from '@/views/information/warehouse-info/setup';
 import { formatValue } from '@/common/methods';
-import {getAddress} from "@/services/go/adress";
+import { getAddress } from '@/services/go/adress';
 
 export default defineComponent({
     name: 'warehouse_info_btn-detail',
@@ -90,10 +90,10 @@ export default defineComponent({
         const { visible, cancel } = closeModal('detail');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
-        const {getProvinceName, getCityName, getDistrictName} = getAddress();
+        const { getProvinceName, getCityName, getDistrictName } = getAddress();
         function submit() {
             cancel();
-            context.emit('refresh')
+            context.emit('refresh');
         }
         return {
             visible,

+ 1 - 1
src/views/information/warehouse-info/compoments/disable/index.vue

@@ -4,7 +4,7 @@
            title="停用仓库信息"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/information/warehouse-info/compoments/modify/index.vue

@@ -4,7 +4,7 @@
            title="修改仓库信息"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/information/warehouse-info/compoments/recover/index.vue

@@ -4,7 +4,7 @@
            title="恢复仓库信息"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

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

@@ -4,7 +4,7 @@
            title="交收审核"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/manage/business-review/components/settlementCancel/index.vue

@@ -4,7 +4,7 @@
            title="撤销交收登记"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/manage/business-review/components/settlementDetail/index.vue

@@ -4,7 +4,7 @@
            title="交收记录详情"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

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

@@ -4,7 +4,7 @@
            title="点价审核"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/manage/business-review/components/somepriceCancel/index.vue

@@ -4,7 +4,7 @@
            title="撤销点价登记"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/manage/business-review/components/somepriceDetail/index.vue

@@ -4,7 +4,7 @@
            title="点价记录详情"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

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

@@ -4,7 +4,7 @@
            title="款项审核"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/manage/finance-review/components/fundsCancel/index.vue

@@ -4,7 +4,7 @@
            title="撤销款项登记"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/manage/finance-review/components/fundsDetail/index.vue

@@ -4,7 +4,7 @@
            title="款项详情"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

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

@@ -4,7 +4,7 @@
            title="发票审核"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/manage/finance-review/components/invoiceCancel/index.vue

@@ -4,7 +4,7 @@
            title="撤销发票登记"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/manage/finance-review/components/invoiceDetail/index.vue

@@ -4,7 +4,7 @@
            title="发票登记详情"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

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

@@ -4,7 +4,7 @@
            title="款项审核"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/manage/inventory-review/components/checkinCancel/index.vue

@@ -4,7 +4,7 @@
            title="撤销款项登记"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/manage/inventory-review/components/checkinDetail/index.vue

@@ -4,7 +4,7 @@
            title="款项详情"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

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

@@ -4,7 +4,7 @@
            title="发票审核"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/manage/inventory-review/components/checkoutCancel/index.vue

@@ -4,7 +4,7 @@
            title="撤销发票登记"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/manage/inventory-review/components/checkoutDetail/index.vue

@@ -4,7 +4,7 @@
            title="出库登记详情"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 1 - 1
src/views/platinum/platinum_customer_info/compoments/check/index.vue

@@ -4,7 +4,7 @@
            title="审核客户资料"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 2 - 2
src/views/platinum/platinum_customer_info/compoments/detail/index.vue

@@ -4,7 +4,7 @@
            title="客户资料详情"
            centered
            v-model:visible="visible"
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>
@@ -22,7 +22,7 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import Detail from '../common-detail/index.vue';
-import {QhjCustomer} from "@/services/go/ermcp/qhj/interface";
+import { QhjCustomer } from '@/services/go/ermcp/qhj/interface';
 
 export default defineComponent({
     name: 'custom-detail',

+ 1 - 1
src/views/platinum/platinum_customer_info/compoments/disable/index.vue

@@ -4,7 +4,7 @@
            title="停用客户资料"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="cancel"
            width="890px">
     <template #footer>

+ 24 - 14
src/views/search/inventory/components/add/index.vue

@@ -4,7 +4,7 @@
            :title="`出入库登记(生产${inOrOut()})`"
            v-model:visible="visible"
            centered
-           :maskClosable="maskClosableFlag"
+           :maskClosable="false"
            @cancel="closeAction"
            width="890px">
     <template #footer>
@@ -124,8 +124,8 @@ import { handleDeliveryGoods, handleFormState, handleWarehouseList, handleWareho
 import { validateAction } from '@/common/setup/form';
 import { FormState } from './interface';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import {ermcpInOutStockApplyReq} from "@/services/proto/warehouse";
-import {ERMCPAreaInOutStockApplyReq} from "@/services/proto/warehouse/interface";
+import { ermcpInOutStockApplyReq } from '@/services/proto/warehouse';
+import { ERMCPAreaInOutStockApplyReq } from '@/services/proto/warehouse/interface';
 
 export default defineComponent({
     name: 'add-spot-contract',
@@ -138,8 +138,8 @@ export default defineComponent({
     },
     setup(props, context) {
         const { visible, cancel } = closeModal('inventory_current_add');
-        const { rules, formState, formRef, initFormData } = handleFormState()
-        const { warehouseType, inOrOut } = handleWarehouseType(formState)
+        const { rules, formState, formRef, initFormData } = handleFormState();
+        const { warehouseType, inOrOut } = handleWarehouseType(formState);
         const { wareHouseList, getWarehouseList } = handleWarehouseList();
         const { deliveryGoodsList, gblist, gmlist, numberUnit, WrStandardChange, getDeliveryGoods, deliveryGoodsChange } = handleDeliveryGoods(formState);
         const loading = ref<boolean>(false);
@@ -154,17 +154,17 @@ export default defineComponent({
                     // SpotContractID: param.SpotContractID, // uint64 关联现货合同ID [1:采购入库 2:销售出库 ](1,2状态必填)
                     WarehouseInfo: param.WarehouseInfo as number, // uint64 现货仓库ID
                     Qty: Number(param.Qty), // double 数量
-                    ApplyRemark: "", // string 申请备注
-                }
-                requestResultLoadingAndInfo(ermcpInOutStockApplyReq, reqParam, loading, ['出入库登记成功', '出入库登记失败:'] ).then(() => {
+                    ApplyRemark: '', // string 申请备注
+                };
+                requestResultLoadingAndInfo(ermcpInOutStockApplyReq, reqParam, loading, ['出入库登记成功', '出入库登记失败:']).then(() => {
                     closeAction();
                     context.emit('refresh');
                 });
-            })
+            });
         }
         function closeAction() {
-          Object.assign(formState, initFormData())
-          cancel();
+            Object.assign(formState, initFormData());
+            cancel();
         }
         initData(() => {
             getWarehouseList();
@@ -176,9 +176,19 @@ export default defineComponent({
             submit,
             loading,
             maskClosableFlag: false,
-            rules, formState, formRef,
-            warehouseType, inOrOut,wareHouseList,
-            deliveryGoodsList, gblist, gmlist, numberUnit, WrStandardChange, getDeliveryGoods, deliveryGoodsChange 
+            rules,
+            formState,
+            formRef,
+            warehouseType,
+            inOrOut,
+            wareHouseList,
+            deliveryGoodsList,
+            gblist,
+            gmlist,
+            numberUnit,
+            WrStandardChange,
+            getDeliveryGoods,
+            deliveryGoodsChange,
         };
     },
 });