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

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

@@ -114,6 +114,7 @@ export default defineComponent({
         const loading = ref<boolean>(false);
 
         function submit() {
+
             cancel();
         }
 

src/views/information/account_info/compoments/add-traders/index.vue

@@ -60,7 +60,7 @@ export default defineComponent({
         function submit() {
             validateAction<TraderFormState>(formRef, formState).then((res) => {
                 const reqParam: LoginaccountOperateReq = {
-                    operatetype: 10, // uint32 操作类型-1:新增 2:修改 3:新增管理员 4:修改管理员 5:锁定 6:解锁 7:注销 8:恢复 9:重置密码 10:新增登录帐号 11:停用用户 12：恢复用户 13:修改用户信息
+                    operatetype: 1, // uint32 操作类型-1:新增 2:修改 3:新增管理员 4:修改管理员 5:锁定 6:解锁 7:注销 8:恢复 9:重置密码 10:新增登录帐号 11:停用用户 12：恢复用户 13:修改用户信息
                     roleids: [24],
                     logintaaccounts: [],
                     accountname: res.rolename,

src/views/information/custom/compoments/modify/index.vue

@@ -330,11 +330,11 @@ export default defineComponent({
         function submit(OperateType: 1 | 2) {
             validateAction<FormState>(formRef, formState).then((param) => {
                 const reqParam: ModifyUserInfoApplyReq = {
-                    customername: param.customername, // 必填
+                    customername: Number(param.userinfotype) === 1 ? param.username : param.customername, // 必填
+                    username: param.username,
                     userid: userid.value,
                     memberareaid: getUserId(),
                     userinfotype: Number(param.userinfotype),
-                    username: param.customername,
                     userstate: OperateType, // 1： 保存草稿 2： 新增
                     cardtype: param.cardtype, // 证件类型
                     cardnum: param.cardnum, // 证件号码

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

@@ -59,7 +59,8 @@
           <a-col :span="12">
             <a-form-item label="调整保证金">
               <span class="white">{{
-                                  formatValue(selectedRow.addmargin !== 0 ? "+" + formatValue(selectedRow.addmargin) : (selectedRow.decmargin === 0 ? 0.0 : "-" + formatValue(selectedRow.decmargin)))
+                                  formatValue(selectedRow.addmargin !== 0 && selectedRow.addmargin !== undefined ?
+                  "+" + formatValue(selectedRow.addmargin) : (selectedRow.decmargin === 0 ? 0.0 : "-" + formatValue(selectedRow.decmargin)))
                               }}</span>
             </a-form-item>
           </a-col>
@@ -114,6 +115,7 @@ export default defineComponent({
             }
         });
         function submit() {
+            console.log(props.selectedRow.addmargin)
             context.emit('refresh');
             cancel();
         }

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

@@ -1,140 +1,157 @@
 <template>
-  <!-- 管理-业务审核-交收 -->
-  <div class="business-review-js"
-       :loading="loading">
-    <Filter @search="search">
-      <BtnList :btnList="commonBtn" />
-    </Filter>
-    <contextMenu :contextMenuList="forDataBtn">
-      <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{ record }">
-          <BtnList :btnList="record.btnList" />
-        </template>
+    <!-- 管理-业务审核-交收 -->
+    <div class="business-review-js"
+         :loading="loading">
+        <Filter @search="search">
+            <BtnList :btnList="commonBtn"/>
+        </Filter>
+        <contextMenu :contextMenuList="forDataBtn">
+            <a-table :columns="columns"
+                     class="topTable hiddenFirstCol"
+                     :pagination="false"
+                     :expandedRowKeys="expandedRowKeys"
+                     :customRow="Rowclick"
+                     rowKey="key"
+                     :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{ record }">
+                    <BtnList :btnList="record.btnList"/>
+                </template>
 
-        <template #contracttype="{ text }">
-          <a>{{ getContractTypeName(text) }}</a>
-        </template>
+                <template #contracttype="{ text }">
+                    <a>{{ getContractTypeName(text) }}</a>
+                </template>
 
-        <template #applystatus="{ text }">
-          <a>{{ getApplyStatusName(text) }}</a>
-        </template>
+                <template #applystatus="{ text }">
+                    <a>{{ getApplyStatusName(text) }}</a>
+                </template>
 
-      </a-table>
-    </contextMenu>
-    <!-- 点价记录详情 -->
-    <SettlementDetail :selectedRow="selectedRow"
-                      @refresh="getTableData" />
-    <!-- 交收审核 -->
-    <SettlementAudit :selectedRow="selectedRow"
-                     @refresh="getTableData" />
-    <!-- 撤销点价登记 -->
-    <SettlementCancel :selectedRow="selectedRow"
-                      @refresh="getTableData" />
-  </div>
+                <template #addmargin||decmargin="{ record }">
+                    <a>{{
+                        (record.addmargin !== 0 && record.addmargin !== undefined ?
+                        "+" + (record.addmargin) : (record.decmargin === 0 || record.decmargin === undefined ? "" : "-" + (record.decmargin)))
+                        }} </a>
+                </template>
+
+            </a-table>
+        </contextMenu>
+        <!-- 点价记录详情 -->
+        <SettlementDetail :selectedRow="selectedRow"
+                          @refresh="getTableData"/>
+        <!-- 交收审核 -->
+        <SettlementAudit :selectedRow="selectedRow"
+                         @refresh="getTableData"/>
+        <!-- 撤销点价登记 -->
+        <SettlementCancel :selectedRow="selectedRow"
+                          @refresh="getTableData"/>
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+    import {
+        defineComponent,
+        initData,
+        getTableColumns,
+        getTableEvent,
+        getBtnList,
+        contextMenu,
+        BtnList
+    } from '@/common/export/table';
 
-import { SettlementDetail, SettlementAudit, SettlementCancel, Filter } from '../../components';
+    import {SettlementDetail, SettlementAudit, SettlementCancel, Filter} from '../../components';
 
-import { queryTableList, QryBussinessJsRsp } from './setup';
-import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
-import { getApplyStatusName } from '@/views/manage/business-review/setup';
-import { invoiceStatusName } from '@/views/manage/finance-review/setup';
-import { Column, ColumnType } from '@/common/setup/table';
+    import {queryTableList, QryBussinessJsRsp} from './setup';
+    import {getContractTypeName, getPriceTypeName} from '@/views/information/spot-contract/setup';
+    import {getApplyStatusName} from '@/views/manage/business-review/setup';
+    import {invoiceStatusName} from '@/views/manage/finance-review/setup';
+    import {Column, ColumnType} from '@/common/setup/table';
 
-export default defineComponent({
-    name: 'business-review-js',
-    components: {
-        contextMenu,
-        Filter,
-        BtnList,
-        SettlementDetail,
-        SettlementAudit,
-        SettlementCancel,
-    },
-    setup() {
-        // 表头数据
-        const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
-        // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QryBussinessJsRsp>({});
-        // 表格操作按钮列表
-        const { commonBtn, forDataBtn } = getBtnList('business_review_settlement', true);
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList({});
-        function getTableData() {
-            // 获取列表数据
-            queryTable().then(() => {
-                tableList.value.forEach((el) => {
-                    if (el.applystatus === 1) {
-                        // 1:待审核
-                        Object.assign(el, { btnList: forDataBtn.value });
-                    } else {
-                        const item = forDataBtn.value.find((e) => e.lable === '详情');
-                        item && Object.assign(el, { btnList: [item] });
-                    }
-                });
-            });
-        }
-        initData(() => {
-            // 获取列表数据
-            getTableData();
-            // 注册表头信息 过滤
-            registerColumn('table_pcweb_business_aduit_js', ['contracttype', 'contractno', 'deliverygoodsname'], (e: Column, item: ColumnType, filtered: any) => {
-                if (e.columnfield === 'buyusernameOrsellusername') {
-                    item.onFilter = (value: string, record: QryBussinessJsRsp) => {
-                        const { contracttype, buyusername, sellusername } = record;
-                        if (contracttype === 1) {
-                            // 采购
-                            return sellusername.includes(value);
+    export default defineComponent({
+        name: 'business-review-js',
+        components: {
+            contextMenu,
+            Filter,
+            BtnList,
+            SettlementDetail,
+            SettlementAudit,
+            SettlementCancel,
+        },
+        setup() {
+            // 表头数据
+            const {columns, registerColumn, updateColumn, filteredInfo} = getTableColumns();
+            // 表格事件
+            const {expandedRowKeys, selectedRow, Rowclick} = getTableEvent<QryBussinessJsRsp>({});
+            // 表格操作按钮列表
+            const {commonBtn, forDataBtn} = getBtnList('business_review_settlement', true);
+            // 表格列表数据
+            const {loading, tableList, queryTable} = queryTableList({});
+
+            function getTableData() {
+                // 获取列表数据
+                queryTable().then(() => {
+                    tableList.value.forEach((el) => {
+                        if (el.applystatus === 1) {
+                            // 1:待审核
+                            Object.assign(el, {btnList: forDataBtn.value});
                         } else {
-                            return buyusername.includes(value);
+                            const item = forDataBtn.value.find((e) => e.lable === '详情');
+                            item && Object.assign(el, {btnList: [item]});
                         }
-                    };
-                    item.filteredValue = filtered.buyusernameOrsellusername || null;
-                }
+                    });
+                });
+            }
+
+            initData(() => {
+                // 获取列表数据
+                getTableData();
+                // 注册表头信息 过滤
+                registerColumn('table_pcweb_business_aduit_js', ['contracttype', 'contractno', 'deliverygoodsname'], (e: Column, item: ColumnType, filtered: any) => {
+                    if (e.columnfield === 'buyusernameOrsellusername') {
+                        item.onFilter = (value: string, record: QryBussinessJsRsp) => {
+                            const {contracttype, buyusername, sellusername} = record;
+                            if (contracttype === 1) {
+                                // 采购
+                                return sellusername.includes(value);
+                            } else {
+                                return buyusername.includes(value);
+                            }
+                        };
+                        item.filteredValue = filtered.buyusernameOrsellusername || null;
+                    }
+                });
             });
-        });
 
-        // 查询
-        function search(value: any) {
-            filteredInfo.value = value;
-            // 更新表信息
-            updateColumn();
-        }
+            // 查询
+            function search(value: any) {
+                filteredInfo.value = value;
+                // 更新表信息
+                updateColumn();
+            }
 
-        return {
-            columns,
-            filteredInfo,
-            expandedRowKeys,
-            selectedRow,
-            Rowclick,
-            commonBtn,
-            forDataBtn,
-            loading,
-            tableList,
-            search,
-            getPriceTypeName,
-            getContractTypeName,
-            getApplyStatusName,
-            invoiceStatusName,
-            getTableData,
-        };
-    },
-});
+            return {
+                columns,
+                filteredInfo,
+                expandedRowKeys,
+                selectedRow,
+                Rowclick,
+                commonBtn,
+                forDataBtn,
+                loading,
+                tableList,
+                search,
+                getPriceTypeName,
+                getContractTypeName,
+                getApplyStatusName,
+                invoiceStatusName,
+                getTableData,
+            };
+        },
+    });
 </script>
 
 <style lang="less">
-.business-review-js {
-}
+    .business-review-js {
+    }
 </style
 >;
 

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

@@ -51,7 +51,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="登记金额">
-              <span class="white">{{ formatValue(selectedRow.payamount) }}</span>
+              <span class="white">{{(selectedRow.deductamount === undefined || selectedRow.deductamount === 0) ? formatValue(selectedRow.payamount): formatValue(selectedRow.deductamount)}}</span>
             </a-form-item>
           </a-col>
         </a-row>

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

@@ -109,7 +109,7 @@ export default defineComponent({
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
 
-        function submit() {
+        function submit(){
             context.emit('refresh');
             cancel();
         }

src/views/manage/finance-review/list/funds/index.vue

@@ -1,158 +1,172 @@
 <template>
-  <!-- 管理 - 财务审核 - 款项 -->
-  <div class="business-review-js"
-       :loading="loading">
-    <Filter @search="search">
-      <BtnList :btnList="commonBtn" />
-    </Filter>
-    <contextMenu :contextMenuList="forDataBtn">
-      <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{ record }">
-          <BtnList :btnList="record.btnList" />
-        </template>
-        <!-- 现货合同类型 -->
-        <template #contractstatus="{ record }">
-          <a>{{ getApplyStatusName(record.applystatus) }}</a>
-        </template>
-        <!-- 合同类型-->
-        <template #contracttype="{ record }">
-          <a>{{ getContractTypeName(record.contracttype) }}</a>
-        </template>
-        <!-- 状态 -->
-        <template #applystatus="{ text }">
-          <a>{{ getApplyStatusName(text) }}</a>
-        </template>
-        <!-- 点价类型 -->
-        <template #operateapplytype="{ text }">
-          <a>{{ operateApplyTypeName(text) }}</a>
-        </template>
-        <!-- 款项类型 -->
-        <template #kxtype="{ record }">
-          <a>{{ stateName(record.deductamount, record.contracttype) }}</a>
-        </template>
-        <!-- 对手方 -->
-        <template #buyusernameOrsellusername="{ record }">
-          <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
-        </template>
+    <!-- 管理 - 财务审核 - 款项 -->
+    <div class="business-review-js"
+         :loading="loading">
+        <Filter @search="search">
+            <BtnList :btnList="commonBtn"/>
+        </Filter>
+        <contextMenu :contextMenuList="forDataBtn">
+            <a-table :columns="columns"
+                     class="topTable hiddenFirstCol"
+                     :pagination="false"
+                     :expandedRowKeys="expandedRowKeys"
+                     :customRow="Rowclick"
+                     rowKey="key"
+                     :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{ record }">
+                    <BtnList :btnList="record.btnList"/>
+                </template>
+                <!-- 现货合同类型 -->
+                <template #contractstatus="{ record }">
+                    <a>{{ getApplyStatusName(record.applystatus) }}</a>
+                </template>
+                <!-- 合同类型-->
+                <template #contracttype="{ record }">
+                    <a>{{ getContractTypeName(record.contracttype) }}</a>
+                </template>
+                <!-- 状态 -->
+                <template #applystatus="{ text }">
+                    <a>{{ getApplyStatusName(text) }}</a>
+                </template>
+                <!-- 点价类型 -->
+                <template #operateapplytype="{ text }">
+                    <a>{{ operateApplyTypeName(text) }}</a>
+                </template>
+                <!-- 款项类型 -->
+                <template #kxtype="{ record }">
+                    <a>{{ stateName(record.deductamount, record.contracttype) }}</a>
+                </template>
+                <!-- 对手方 -->
+                <template #buyusernameOrsellusername="{ record }">
+                    <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
+                </template>
+                <!-- 金额 如果是退款 则使用deductamount  如果是付款则使用payamount-->
+                <template #payamount="{ record }">
+                    <a>{{ (record.deductamount === undefined || record.deductamount === 0) ? record.payamount: record.deductamount }}</a>
+                </template>
 
-      </a-table>
-    </contextMenu>
-    <!-- 点价记录详情 -->
-    <FundsDetail :selectedRow="selectedRow"
-                 @refresh="getTableData" />
-    <!-- 交收审核 -->
-    <FundsAudit :selectedRow="selectedRow"
-                @refresh="getTableData" />
-    <!-- 撤销点价登记 -->
-    <FundsCancel :selectedRow="selectedRow"
-                 @refresh="getTableData" />
-  </div>
+            </a-table>
+        </contextMenu>
+        <!-- 点价记录详情 -->
+        <FundsDetail :selectedRow="selectedRow"
+                     @refresh="getTableData"/>
+        <!-- 交收审核 -->
+        <FundsAudit :selectedRow="selectedRow"
+                    @refresh="getTableData"/>
+        <!-- 撤销点价登记 -->
+        <FundsCancel :selectedRow="selectedRow"
+                     @refresh="getTableData"/>
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+    import {
+        defineComponent,
+        initData,
+        getTableColumns,
+        getTableEvent,
+        getBtnList,
+        contextMenu,
+        BtnList
+    } from '@/common/export/table';
 
-import { Filter, FundsAudit, FundsCancel, FundsDetail } from '../../components';
+    import {Filter, FundsAudit, FundsCancel, FundsDetail} from '../../components';
 
-import { queryTableList, QryBussinessKxRsp } from './setup';
-import { invoiceStatusName, kxtypeName, operateApplyTypeName, stateName } from '@/views/manage/finance-review/setup';
-import { getApplyStatusName } from '@/views/manage/business-review/setup';
-import { getContractTypeName } from '@/views/information/spot-contract/setup';
-import { Column, ColumnType } from '@/common/setup/table';
+    import {queryTableList, QryBussinessKxRsp} from './setup';
+    import {invoiceStatusName, kxtypeName, operateApplyTypeName, stateName} from '@/views/manage/finance-review/setup';
+    import {getApplyStatusName} from '@/views/manage/business-review/setup';
+    import {getContractTypeName} from '@/views/information/spot-contract/setup';
+    import {Column, ColumnType} from '@/common/setup/table';
 
-export default defineComponent({
-    name: 'business-review-js',
-    components: {
-        contextMenu,
-        Filter,
-        BtnList,
-        FundsDetail,
-        FundsAudit,
-        FundsCancel,
-    },
-    setup() {
-        // 表头数据
-        const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
-        // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QryBussinessKxRsp>({});
-        // 表格操作按钮列表
-        const { commonBtn, forDataBtn } = getBtnList('finance_review_funds', true);
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList({});
-        function getTableData() {
-            // 获取列表数据
-            queryTable().then(() => {
-                tableList.value.forEach((el) => {
-                    if (el.applystatus === 1) {
-                        // 1:待审核
-                        Object.assign(el, { btnList: forDataBtn.value });
-                    } else {
-                        const item = forDataBtn.value.find((e) => e.lable === '详情');
-                        item && Object.assign(el, { btnList: [item] });
-                    }
-                });
-            });
-        }
-        initData(() => {
-            // 获取列表数据
-            getTableData();
-            // 注册表头信息 过滤
-            registerColumn('table_pcweb_fincial_aduit_kx', ['contracttype', 'contractno', 'deliverygoodsname'], (e: Column, item: ColumnType, filtered: any) => {
-                if (e.columnfield === 'buyusernameOrsellusername') {
-                    item.onFilter = (value: string, record: QryBussinessKxRsp) => {
-                        const { contracttype, buyusername, sellusername } = record;
-                        if (contracttype === 1) {
-                            // 采购
-                            return sellusername.includes(value);
+    export default defineComponent({
+        name: 'business-review-js',
+        components: {
+            contextMenu,
+            Filter,
+            BtnList,
+            FundsDetail,
+            FundsAudit,
+            FundsCancel,
+        },
+        setup() {
+            // 表头数据
+            const {columns, registerColumn, updateColumn, filteredInfo} = getTableColumns();
+            // 表格事件
+            const {expandedRowKeys, selectedRow, Rowclick} = getTableEvent<QryBussinessKxRsp>({});
+            // 表格操作按钮列表
+            const {commonBtn, forDataBtn} = getBtnList('finance_review_funds', true);
+            // 表格列表数据
+            const {loading, tableList, queryTable} = queryTableList({});
+
+            function getTableData() {
+                // 获取列表数据
+                queryTable().then(() => {
+                    tableList.value.forEach((el) => {
+                        if (el.applystatus === 1) {
+                            // 1:待审核
+                            Object.assign(el, {btnList: forDataBtn.value});
                         } else {
-                            return buyusername.includes(value);
+                            const item = forDataBtn.value.find((e) => e.lable === '详情');
+                            item && Object.assign(el, {btnList: [item]});
                         }
-                    };
-                    item.filteredValue = filtered.buyusernameOrsellusername || null;
-                }
+                    });
+                });
+            }
+
+            initData(() => {
+                // 获取列表数据
+                getTableData();
+                // 注册表头信息 过滤
+                registerColumn('table_pcweb_fincial_aduit_kx', ['contracttype', 'contractno', 'deliverygoodsname'], (e: Column, item: ColumnType, filtered: any) => {
+                    if (e.columnfield === 'buyusernameOrsellusername') {
+                        item.onFilter = (value: string, record: QryBussinessKxRsp) => {
+                            const {contracttype, buyusername, sellusername} = record;
+                            if (contracttype === 1) {
+                                // 采购
+                                return sellusername.includes(value);
+                            } else {
+                                return buyusername.includes(value);
+                            }
+                        };
+                        item.filteredValue = filtered.buyusernameOrsellusername || null;
+                    }
+                });
             });
-        });
 
-        // 查询
-        function search(value: any) {
-            filteredInfo.value = value;
-            // 更新表信息
-            updateColumn();
-        }
+            // 查询
+            function search(value: any) {
+                filteredInfo.value = value;
+                // 更新表信息
+                updateColumn();
+            }
 
-        return {
-            columns,
-            filteredInfo,
-            expandedRowKeys,
-            selectedRow,
-            Rowclick,
-            commonBtn,
-            forDataBtn,
-            loading,
-            tableList,
-            search,
-            invoiceStatusName,
-            getApplyStatusName,
-            operateApplyTypeName,
-            getContractTypeName,
-            kxtypeName,
-            stateName,
-            getTableData,
-        };
-    },
-});
+            return {
+                columns,
+                filteredInfo,
+                expandedRowKeys,
+                selectedRow,
+                Rowclick,
+                commonBtn,
+                forDataBtn,
+                loading,
+                tableList,
+                search,
+                invoiceStatusName,
+                getApplyStatusName,
+                operateApplyTypeName,
+                getContractTypeName,
+                kxtypeName,
+                stateName,
+                getTableData,
+            };
+        },
+    });
 </script>
 
 <style lang="less">
-.business-review-js {
-}
+    .business-review-js {
+    }
 </style
 >;