소스 검색

处理报错

huangbin 4 년 전
부모
커밋
4095717134

+ 6 - 6
src/services/proto/accountinfo/index.ts

@@ -1,8 +1,8 @@
-import {buildProtoReq50, parseProtoRsp50} from "@/services/socket/protobuf/buildReq";
 import APP from "@/services";
-import {Callback} from "@/utils/websocket";
-import {UserInfoCheckMangeReq, UserInfoCheckMangeRsp} from "@/services/proto/accountinfo/interface";
-import {getSelectedAccount} from "@/services/bus/account";
+import { getSelectedAccountId } from "@/services/bus/account";
+import { UserInfoCheckMangeReq, UserInfoCheckMangeRsp } from "@/services/proto/accountinfo/interface";
+import { buildProtoReq50, parseProtoRsp50 } from "@/services/socket/protobuf/buildReq";
+import { Callback } from "@/utils/websocket";
 
 /**
  * 客户资料审核
@@ -13,9 +13,9 @@ export const userInfoCheck = (param: UserInfoCheckMangeReq): Promise<UserInfoChe
         const params = {
             protobufName: 'UserInfoCheckMangeReq',
             funCodeName: 'UserInfoCheckMangeReq',
-            reqParams:  param,
+            reqParams: param,
             msgHeadParams: {
-                AccountID: getSelectedAccount(),
+                AccountID: getSelectedAccountId(),
                 MarketID: 18,
                 GoodsID: 0,
             }

+ 118 - 117
src/views/information/custom/compoments/check/index.vue

@@ -6,122 +6,122 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-        <a-button key="submit"
-                  type="primary"
-                  @click="cancel">取消</a-button>
+      <a-button key="submit"
+                type="primary"
+                @click="cancel">取消</a-button>
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
                 @click="submit">审核通过</a-button>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="refuseSubmit">审核拒绝</a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="refuseSubmit">审核拒绝</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">{{ getCardTypeName(selectedRow.cardtype) }}</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-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">{{ getCardTypeName(selectedRow.cardtype) }}</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, PropType, ref} from 'vue';
+import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import {ModifyUserInfoReq, QueryCustomInfoType} from "@/services/go/ermcp/customInfo/interface";
-import {formatValue} from "@/common/methods";
-import {getCardTypeName, getStatusName} from "@/views/information/custom/setup";
-import {cancelCustomInfo, checkCustomInfo} from "@/views/information/custom/compoments/setup";
-import {UserInfoCheckMangeReq} from "@/services/proto/accountinfo/interface";
-import {getSelectedAccount, getUserId} from "@/services/bus/account";
+import { ModifyUserInfoReq, QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+import { formatValue } from '@/common/methods';
+import { getCardTypeName, getStatusName } from '@/views/information/custom/setup';
+import { cancelCustomInfo, checkCustomInfo } from '@/views/information/custom/compoments/setup';
+import { UserInfoCheckMangeReq } from '@/services/proto/accountinfo/interface';
+import { getSelectedAccountId, getUserId } from '@/services/bus/account';
 
 export default defineComponent({
     name: 'custom_info_btn_check',
@@ -133,22 +133,23 @@ export default defineComponent({
         },
     },
     setup(props) {
-        const {loading, checkCustomerInfo} = checkCustomInfo()
+        const { loading, checkCustomerInfo } = checkCustomInfo();
         const { visible, cancel } = closeModal('custom_info_btn_check');
-        const req : UserInfoCheckMangeReq = {
+        const req: UserInfoCheckMangeReq = {
             audituserid: getUserId(),
-            userid : props.selectedRow.userid,
+            userid: props.selectedRow.userid,
             auditflag: 1,
-            remark: ''}
+            remark: '',
+        };
         function submit() {
-            req.auditflag = 1
-            req.userid = props.selectedRow.userid
-            checkCustomerInfo(req, cancel)
+            req.auditflag = 1;
+            req.userid = props.selectedRow.userid;
+            checkCustomerInfo(req, cancel);
         }
-        function refuseSubmit(){
-            req.auditflag = 2
-            req.userid = props.selectedRow.userid
-            checkCustomerInfo(req, cancel)
+        function refuseSubmit() {
+            req.auditflag = 2;
+            req.userid = props.selectedRow.userid;
+            checkCustomerInfo(req, cancel);
         }
         return {
             visible,

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

@@ -309,6 +309,7 @@ import { handleAdd, initFormState } from './setup';
 import { DeliveryGoodsApplyReq } from '@/services/proto/delivery/interface';
 import { getGoodsUnitList } from '../../setup';
 import { RuleObject, ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
+import { FormState } from './interface';
 
 const validateUnit = async (rule: RuleObject, value: number) => {
     if (value) {
@@ -420,7 +421,7 @@ export default defineComponent({
 
         // 表单
         const formRef = ref();
-        const formState: UnwrapRef<DeliveryGoodsApplyReq> = reactive(initFormState());
+        const formState: UnwrapRef<FormState> = reactive(initFormState(() => {}));
         const rules = {
             deliverygoodsname: [{ required: true, message: '请输入现货品种名称', trigger: 'blur' }],
             // unitid: [{ required: true, message: '请选择单位', trigger: 'change' }],

+ 3 - 3
src/views/information/goods/components/add/interface.ts

@@ -3,14 +3,14 @@ export interface GLDWRStandardEx {
     wrstandardname: string // string 型号名称
     unitid: number | undefined// uint64 单位ID
     convertfactor: number// double 标仓系数(接口为3.1及以上版本时传)
-    callback: Function;
+    callback?: Function;
 }
 
 // 现货商品品牌数据 0 29 173
 export interface GLDDGFactoryItemEx {
     dgfactoryitemid?: number // uint64 品牌ID(修改时有值)
     dgfactoryitemvalue: string // string 品牌名称
-    callback: Function;
+    callback?: Function;
 }
 
 // 现货商品折算配置明细数据 0 29 127
@@ -18,7 +18,7 @@ export interface WRSConvertDetailEx {
     middlegoodsid: number // uint64 套保品种ID(接口为3.1及以下版本时传套保品种ID,否则传期货品种ID)
     unitid: number // uint64 单位ID
     convertratio: number // double 套保系数
-    callback: Function;
+    callback?: Function;
 }
 export interface FormState {
     deliverygoodscode?: string // string 交割商品代码(新增时有值)