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

src/services/go/ermcp/customInfo/index.ts

@@ -50,3 +50,15 @@ export function QueryDeleteUserInfoApply(userId: number): Promise<BaseResponse>
         throw new Error(`删除客户申请: ${err.message}`);
     });
 }
+
+/**
+ * 更新用户状态 /User/UpdateUserAccountStatus
+ * @param accountStatus 账户状态 - 4:正常 6:注销（停用）
+ * @constructor
+ */
+export function UpdateUserAccountStatus(accountStatus: number): Promise<BaseResponse> {
+    const userID = APP.get('userAccount').memberuserid;
+    return commonUpdate_go('/User/UpdateUserAccountStatus', { userID, accountStatus }, ).catch((err) => {
+        throw new Error(`更新用户状态: ${err.message}`);
+    });
+}

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

@@ -12,27 +12,130 @@
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
-                @click="submit">完成</a-button>
+                @click="submit">确认撤销</a-button>
     </template>
+      <a-form class="inlineForm"
+              :form="form"
+              @submit="handleSearch">
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="客户类型">
+                      <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="企业名称">
+                      <span class="white">{{ formatValue(selectedRow.customername)}}</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.nickname) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="证件类型">
+                      <span class="white">{{ formatValue(selectedRow.cardtypename) }}</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.legalpersonname) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="证件号码">
+                      <span class="white">{{ formatValue(selectedRow.cardnum) }}</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.taxpayernum) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="营业执照">
+                      <div class="upload">
+                          <div class="look">查看附件</div>
+                      </div>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="联系人">
+                      <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="联系人手机号">
+                      <span class="white">{{ formatValue(selectedRow.mobile) }}</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.telphone) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="状态">
+                      <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="24">
+                  <a-form-item label="通讯地址">
+                      <span class="white">{{ formatValue(selectedRow.address) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="24">
+                  <a-form-item label="备注">
+                      <span class="white">{{ formatValue(selectedRow.remark) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+      </a-form>
   </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import {defineComponent, PropType, ref} from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { Modal } from 'ant-design-vue';
+import {QueryCustomInfoType} from "@/services/go/ermcp/customInfo/interface";
+import {formatValue} from "@/common/methods";
+import {getStatusName} from "@/views/information/custom/setup";
 
 export default defineComponent({
     name: 'custom_info_btn_cancel',
     components: {},
+    props: {
+        selectedRow: {
+            type: Object as PropType<QueryCustomInfoType>,
+            default: {},
+        },
+    },
     setup() {
         const { visible, cancel } = closeModal('custom_info_btn_cancel');
         const loading = ref<boolean>(false);
         function submit() {
             // loading.value = true;
             Modal.confirm({
-                title: 'Do you Want to delete these items?',
-                content: '是否取消',
+                title: '是否确认撤销客户资料',
+                content: '是否撤销',
+                okText: '确认撤销',
+                cancelText: '取消',
                 onOk() {
                     console.log('OK');
                 },
@@ -52,6 +155,8 @@ export default defineComponent({
             cancel,
             submit,
             loading,
+            formatValue,
+            getStatusName,
         };
     },
 });

src/views/information/custom/list/checkpending/index.vue

@@ -31,7 +31,7 @@
     <!-- 停用 -->
     <DisableCustom />
     <!-- 撤销 -->
-    <Cancel />
+    <Cancel :selectedRow="selectedRow" />
     <!-- 审核客户资料 -->
     <Check />
   </div>