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

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

@@ -1,110 +1,110 @@
 <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="pass">审核通过
-      </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="refuse">审核拒绝
-      </a-button>
-    </template>
-    <a-form class="inlineForm">
-      <fieldset class="formFieldSet">
-        <legend>合同基本信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="合同编号">
-              <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="点价类型">
-              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="销售方">
-              <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="现货品种">
-              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>待审核登记信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="类型">
-              <span class="white">{{ invoiceStatusName(selectedRow.contracttype) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="发票金额">
-              <span class="white">{{ formatValue(selectedRow.invoiceamount) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="发票附件">
-              <span class="white">{{ formatValue(selectedRow.invoiceamount) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登记时间">
-              <span class="white">{{ formatValue(selectedRow.applytime) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="登记人">
-              <span class="white">{{ formatValue(selectedRow.applyname) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-    </a-form>
-  </a-modal>
+    <!-- 发票审核-->
+    <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="pass">审核通过
+            </a-button>
+            <a-button key="submit"
+                      type="primary"
+                      :loading="loading"
+                      @click="refuse">审核拒绝
+            </a-button>
+        </template>
+        <a-form class="inlineForm">
+            <fieldset class="formFieldSet">
+                <legend>合同基本信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="合同编号">
+                            <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="点价类型">
+                            <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="销售方">
+                            <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="现货品种">
+                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>待审核登记信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="类型">
+                            <span class="white">{{ invoiceStatusName(selectedRow.contracttype) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="发票金额">
+                            <span class="white">{{ formatValue(selectedRow.InvoiceAmount) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="发票附件">
+                            <span class="white">{{ formatValue(selectedRow.invoiceamount) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="登记时间">
+                            <span class="white">{{ formatValue(selectedRow.applytime) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="登记人">
+                            <span class="white">{{ formatValue(selectedRow.applyname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, reactive, ref, watchEffect } from 'vue';
-import { closeModal } from '@/common/setup/modal/index';
-import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { mergeObj } from '@/utils/objHandle';
-import { getStatusName } from '@/common/constants/enumsName';
-import { formatValue, formatTime } from '@/common/methods';
-import { QryBussinessFpRsp } from '@/services/go/ermcp/finance-review/interface';
-import { invoiceStatusName } from '@/views/manage/finance-review/setup';
-import { getPriceTypeName } from '@/views/information/spot-contract/setup';
-import { Modal } from 'ant-design-vue';
-import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
+import {defineComponent, PropType, reactive, ref, watchEffect} from 'vue';
+import {closeModal} from '@/common/setup/modal/index';
+import {QueryCustomInfoType} from '@/services/go/ermcp/customInfo/interface';
+import {mergeObj} from '@/utils/objHandle';
+import {getStatusName} from '@/common/constants/enumsName';
+import {formatValue, formatTime} from '@/common/methods';
+import {QryBussinessFpRsp} from '@/services/go/ermcp/finance-review/interface';
+import {invoiceStatusName} from '@/views/manage/finance-review/setup';
+import {getPriceTypeName} from '@/views/information/spot-contract/setup';
+import {Modal} from 'ant-design-vue';
+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 {somePriceControl} from '@/views/manage/business-review/components/setup';
+import {financeControl} from '@/views/manage/finance-review/components/setup';
 
 export default defineComponent({
     name: 'finance_review_invoice_audit',
@@ -116,9 +116,10 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const { visible, cancel } = closeModal('finance_review_invoice_audit');
+        const {visible, cancel} = closeModal('finance_review_invoice_audit');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
+
         function submit() {
             loading.value = true;
             setTimeout(() => {
@@ -126,6 +127,7 @@ export default defineComponent({
                 cancel();
             }, 200);
         }
+
         // 审核通过
         function pass() {
             Modal.confirm({
@@ -142,13 +144,15 @@ export default defineComponent({
                             context.emit('refresh');
                             cancel();
                         })
-                        .catch((err) => {});
+                        .catch((err) => {
+                        });
                 },
                 onCancel() {
                     console.log('Cancel');
                 },
             });
         }
+
         // 审核拒绝
         function refuse() {
             Modal.confirm({
@@ -165,7 +169,8 @@ export default defineComponent({
                             context.emit('refresh');
                             cancel();
                         })
-                        .catch((err) => {});
+                        .catch((err) => {
+                        });
                 },
                 onCancel() {
                     console.log('Cancel');

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

@@ -1,106 +1,106 @@
 <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="submit">关闭
-      </a-button>
+    <!-- 撤销发票登记-->
+    <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="submit">关闭
+            </a-button>
 
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="back">撤销
-      </a-button>
-    </template>
-    <a-form class="inlineForm">
-      <fieldset class="formFieldSet">
-        <legend>合同基本信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="合同编号">
-              <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="点价类型">
-              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="销售方">
-              <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="现货品种">
-              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>待审核登记信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="类型">
-              <span class="white">{{ invoiceStatusName(selectedRow.contracttype) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="发票金额">
-              <span class="white">{{ formatValue(selectedRow.invoiceamount) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="发票附件">
-              <span class="white">{{ formatValue(selectedRow.invoiceamount) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登记时间">
-              <span class="white">{{ formatValue(selectedRow.applytime) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="登记人">
-              <span class="white">{{ formatValue(selectedRow.applyname) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-    </a-form>
-  </a-modal>
+            <a-button key="submit"
+                      type="primary"
+                      :loading="loading"
+                      @click="back">撤销
+            </a-button>
+        </template>
+        <a-form class="inlineForm">
+            <fieldset class="formFieldSet">
+                <legend>合同基本信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="合同编号">
+                            <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="点价类型">
+                            <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="销售方">
+                            <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="现货品种">
+                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>待审核登记信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="类型">
+                            <span class="white">{{ invoiceStatusName(selectedRow.contracttype) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="发票金额">
+                            <span class="white">{{ formatValue(selectedRow.InvoiceAmount) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="发票附件">
+                            <span class="white">{{ formatValue(selectedRow.invoiceamount) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="登记时间">
+                            <span class="white">{{ formatValue(selectedRow.applytime) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="登记人">
+                            <span class="white">{{ formatValue(selectedRow.applyname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, reactive, ref, watchEffect } from 'vue';
-import { closeModal } from '@/common/setup/modal/index';
-import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { mergeObj } from '@/utils/objHandle';
-import { getStatusName } from '@/common/constants/enumsName';
-import { formatValue, formatTime } from '@/common/methods';
-import { QryBussinessFpRsp } from '@/services/go/ermcp/finance-review/interface';
-import { invoiceStatusName } from '@/views/manage/finance-review/setup';
-import { getPriceTypeName } from '@/views/information/spot-contract/setup';
-import { Modal } from 'ant-design-vue';
-import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
+import {defineComponent, PropType, reactive, ref, watchEffect} from 'vue';
+import {closeModal} from '@/common/setup/modal/index';
+import {QueryCustomInfoType} from '@/services/go/ermcp/customInfo/interface';
+import {mergeObj} from '@/utils/objHandle';
+import {getStatusName} from '@/common/constants/enumsName';
+import {formatValue, formatTime} from '@/common/methods';
+import {QryBussinessFpRsp} from '@/services/go/ermcp/finance-review/interface';
+import {invoiceStatusName} from '@/views/manage/finance-review/setup';
+import {getPriceTypeName} from '@/views/information/spot-contract/setup';
+import {Modal} from 'ant-design-vue';
+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 {somePriceControl} from '@/views/manage/business-review/components/setup';
+import {financeControl} from '@/views/manage/finance-review/components/setup';
 
 export default defineComponent({
     name: 'finance_review_invoice_cancel',
@@ -112,10 +112,13 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const { visible, cancel } = closeModal('finance_review_invoice_cancel');
+        const {visible, cancel} = closeModal('finance_review_invoice_cancel');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
-        function submit() {}
+
+        function submit() {
+        }
+
         function back() {
             Modal.confirm({
                 title: '是否确认撤销',
@@ -131,13 +134,15 @@ export default defineComponent({
                             context.emit('refresh');
                             cancel();
                         })
-                        .catch((err) => {});
+                        .catch((err) => {
+                        });
                 },
                 onCancel() {
                     console.log('Cancel');
                 },
             });
         }
+
         return {
             visible,
             cancel,