yu.jie 4 лет назад
Родитель
Сommit
a252af2750

+ 1 - 1
src/common/methods/table/interface.ts

@@ -41,7 +41,7 @@ export interface TableKey {
     table_pcweb_sales_all: string; // 销售_全部
     table_pcweb_sales_pointprice: string; // 销售_待点价
     table_pcweb_sales_settle: string; // 销售_履约交收
-    table_pcweb_stock_aduit: string; // 库存审核-入库
+    table_pcweb_stock_aduit_in: string; // 库存审核-入库
     table_pcweb_stock_aduit_out: string; // 库存审核-出库
     table_pcweb_stock_manage_applylog: string; // 库存管理-当前库存
     table_pcweb_stock_manage_current: string; // 库存管理-当前库存

+ 2 - 2
src/views/information/account_info/compoments/add-business/index.vue

@@ -39,7 +39,7 @@
                        name="logincode">
             <a-input class="dialogInput"
                      style="width: 200px"
-                     v-model:value="formState.logincode"
+                     v-model:value="formState.accountname"
                      placeholder="请输入账户名称" />
           </a-form-item>
         </a-col>
@@ -48,7 +48,7 @@
                        name="accountname">
             <a-input class="dialogInput"
                      style="width: 200px"
-                     v-model:value="formState.accountname"
+                     v-model:value="formState.logincode"
                      placeholder="请输入登录账号" />
           </a-form-item>
         </a-col>

+ 2 - 2
src/views/information/account_info/compoments/add-managers/index.vue

@@ -36,7 +36,7 @@
                        name="logincode">
             <a-input class="dialogInput"
                      style="width: 200px"
-                     v-model:value="formState.logincode"
+                     v-model:value="formState.accountname"
                      placeholder="请输入账户名称" />
           </a-form-item>
         </a-col>
@@ -45,7 +45,7 @@
                        name="accountname">
             <a-input class="dialogInput"
                      style="width: 200px"
-                     v-model:value="formState.accountname"
+                     v-model:value="formState.logincode"
                      placeholder="请输入登录账号" />
           </a-form-item>
         </a-col>

+ 2 - 2
src/views/information/account_info/compoments/setup.ts

@@ -19,8 +19,8 @@ export function handleBusinessForm() {
         logintaaccounts: [],
     })
     const rules = {
-        logincode: [{ required: true, message: '请输入登录账号', trigger: 'blur' }],
-        accountname: [{ required: true, message: '请输入账户名称', trigger: 'blur' }],
+        logincode: [{ required: true, message: '请输入账户名称', trigger: 'blur' }],
+        accountname: [{ required: true, message: '请输入登录账号', trigger: 'blur' }],
         password: [{ required: true, message: '请输入账户密码', trigger: 'blur' }],
         mobile: [{ required: true, message: '请输入手机号码', trigger: 'blur' }],
         userid: [{ required: true, message: '请输入账户权限' }],

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

@@ -72,12 +72,12 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="登记时间">
-              <span class="white">{{ formatValue(selectedRow.applytime) }}</span>
+              <span class="white">{{ formatValue(selectedRow.audittime) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="登记人">
-              <span class="white">{{ formatValue(selectedRow.applyname) }}</span>
+              <span class="white">{{ formatValue(selectedRow.auditname) }}</span>
             </a-form-item>
           </a-col>
         </a-row>

+ 1 - 1
src/views/manage/business-review/components/somepriceDetail/index.vue

@@ -79,7 +79,7 @@
                     </a-col>
                     <a-col :span="12">
                         <a-form-item label="登记时间">
-                            <span class="white">{{ formatValue(selectedRow.applytime) }}</span>
+                            <span class="white">{{ formatValue(selectedRow.audittime) }}</span>
                         </a-form-item>
                     </a-col>
                 </a-row>

+ 1 - 1
src/views/manage/business-review/list/someprice/index.vue

@@ -87,7 +87,7 @@ export default defineComponent({
             registerColumn('table_pcweb_business_aduit_dj', ['contracttype', 'contractno', 'deliverygoodsname'], (e: Column, item: ColumnType, filtered: any) => {
                 if (e.columnfield === 'buyusernameOrsellusername') {
                     item.onFilter = (value: string, record: QryBusinessDjRsp) => {
-                        const { contracttype, buyusername, sellusername, applystatus } = record;
+                        const { contracttype, buyusername, sellusername } = record;
                         if (contracttype === 1) {
                             // 采购
                             return sellusername.includes(value);

+ 1 - 1
src/views/manage/inventory-review/list/checkin/index.vue

@@ -84,7 +84,7 @@ export default defineComponent({
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_stock_aduit', ['contracttype', 'contractno', 'deliverygoodsname'], (e: Column, item: ColumnType, filtered: any) => {
+            registerColumn('table_pcweb_stock_aduit_in', ['contracttype', 'contractno', 'deliverygoodsname'], (e: Column, item: ColumnType, filtered: any) => {
                 if (e.columnfield === 'buyusernameOrsellusername') {
                     item.onFilter = (value: string, record: Ermcp3AreaStockApply) => {
                         const { contracttype, buyusername, sellusername } = record;