commit

src/views/business/sell/components/storage/index.vue

@@ -14,7 +14,7 @@
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
-                @click="submit">入库登记
+                @click="submit">出库登记
       </a-button>
     </template>
     <a-form class="inlineForm"
@@ -105,7 +105,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="入库仓库"
+            <a-form-item label="出库仓库"
                          name="WarehouseInfo">
               <a-select class="inlineFormSelect"
                         style="width: 200px"
@@ -119,12 +119,12 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="入库数量"
+            <a-form-item label="出库数量"
                          name="Qty">
               <a-input-number class="dialogInput"
                               style="width: 200px"
                               suffix="单位"
-                              placeholder="请输入入库数量"
+                              placeholder="请输入出库数量"
                               v-model:value="formState.Qty">
               </a-input-number>
             </a-form-item>
@@ -194,7 +194,7 @@ export default defineComponent({
             const wrapEl = unref(formRef);
             wrapEl.validate().then(() => {
                 const params: ERMCPAreaInOutStockApplyReq = {
-                    InOutType: 5, //  5:采购入库 6:销售出库 7:生产入库 8:生产出库
+                    InOutType: 6, //  5:采购入库 6:销售出库 7:生产入库 8:生产出库
                     WRStandardID: props.selectedRow.wrstandardid, //品类ID
                     SpotGoodsBrandID: formState.SpotGoodsBrandID || 0, //现货品牌ID(DGFactoryItem表的ID)
                     DeliveryGoodsID: props.selectedRow.deliverygoodsid, //现货商品ID
@@ -203,7 +203,7 @@ export default defineComponent({
                     Qty: formState.Qty || 0, // double 数量t
                     ApplyRemark: '', // string 申请备注
                 };
-                requestResultLoadingAndInfo(ermcpInOutStockApplyReq, params, loading, ['入库登记成功', '入库登记失败:']).then(() => {
+                requestResultLoadingAndInfo(ermcpInOutStockApplyReq, params, loading, ['出库登记成功', '出库登记失败:']).then(() => {
                     context.emit('refresh');
                     cancel();
                 });

src/views/information/account_info/compoments/modify-managers/index.vue

@@ -75,6 +75,8 @@ import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo
 import { loginAccountOperate } from '@/services/proto/accountinfo';
 import { ErmcpLoginUser, ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
 import { mergeTwoObj } from '@/utils/objHandle';
+import {getUID} from "echarts/types/src/util/component";
+import {getUserId} from "@/services/bus/account";
 
 export default defineComponent({
     name: 'account_info_manager_btn_modify',
@@ -102,10 +104,12 @@ export default defineComponent({
         function submit() {
             validateAction<BusinessFormState>(formRef, formState).then((res) => {
                 const reqParam: LoginaccountOperateReq = {
-                    operatetype: 2, // uint32 操作类型-1:新增 2:修改 3:新增管理员 4:修改管理员 5:锁定 6:解锁 7:注销 8:恢复 9:重置密码 10:新增登录帐号 11:停用用户 12：恢复用户 13:修改用户信息
+                    operatetype: 4, // uint32 操作类型-1:新增 2:修改 3:新增管理员 4:修改管理员 5:锁定 6:解锁 7:注销 8:恢复 9:重置密码 10:新增登录帐号 11:停用用户 12：恢复用户 13:修改用户信息
                     logincode: res.logincode, // string 登录账号
                     accountname: res.accountname, // string 账户名称
-                    password: res.password, // string 登录密码（明文）
+                    loginid: props.selectedData.loginid,
+                    userid: getUserId(),
+                    password: '', // string 登录密码（明文）
                     mobile: res.mobile, // string 手机号码（明文）
                     roleids: [Number(res.userid)], // uint64 账号角色
                     logintaaccounts: [], // LoginTaaccount 期货账户（勾选交易员必填）