update

src/common/setup/filter/index.ts

@@ -7,8 +7,8 @@ export function handleFilter(select: SelectList[] | Ref<SelectList[]>, input: In
     const selected = isRef(select) ? select.value.map(e => {
         const fn = e.change;
         if (fn) {
-            e.change = (id: number) => {
-                fn(id);
+            e.change = (value: any) => {
+                fn(value.key);
                 search()
             }
         } else {

src/utils/objHandle/index.ts

@@ -55,7 +55,6 @@ export function objectToUint8Array(data: object) {
 
 // export function objectToUint8Array(data: object): Uint8Array {
 //     const encode = encodeURI(JSON.stringify(data));// 对字符串进行编码
-//     debugger
 //     const base64String = btoa(encode);// 对编码的字符串转化base64
 //     const padding = '='.repeat((4 - base64String.length % 4) % 4);
 //     // const base64 = (base64String + padding).replace(/\-/g, '+').replace(/_/g, '/');

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

@@ -193,7 +193,6 @@ export default defineComponent({
         //   if(newValue){
         //     initData(()=>{
         //       QueryMiddleGoodsChange(props.selectedRow.deliverygoodsid).then(res=>{
-        //         debugger
         //       })
         //     })
         //   }

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

@@ -1,99 +1,99 @@
 <template>
-    <!-- 发票登记详情-->
-    <a-modal class="add-custom custom-detail"
-             title="发票登记详情"
-             v-model:visible="visible"
-             centered
-             :maskClosable="maskClosableFlag"
-             @cancel="cancel"
-             width="890px">
-        <template #footer>
-            <a-button key="submit"
-                      type="primary"
-                      :loading="loading"
-                      @click="submit">关闭
-            </a-button>
-        </template>
-        <a-form class="inlineForm"
-                :form="form"
-                @submit="handleSearch">
-            <fieldset class="formFieldSet">
-                <legend>合同基本信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="合同编号">
-                            <span class="white">{{
+  <!-- 发票登记详情-->
+  <a-modal class="add-custom custom-detail"
+           title="发票登记详情"
+           v-model:visible="visible"
+           centered
+           :maskClosable="maskClosableFlag"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">关闭
+      </a-button>
+    </template>
+    <a-form class="inlineForm"
+            :form="form"
+            @submit="handleSearch">
+      <fieldset class="formFieldSet">
+        <legend>合同基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{
                                     getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno)
                                 }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="点价类型">
-                            <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="现货品种">
-                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-            <fieldset class="formFieldSet">
-                <legend>待审核登记信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="类型">
-                            <span class="white">{{ invoiceStatusName(selectedRow.contracttype) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="发票金额">
-                            <span class="white">{{ formatValue(selectedRow.InvoiceAmount) }}</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.InvoiceAmount) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="登记时间">
-                            <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-        </a-form>
-    </a-modal>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="点价类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>待审核登记信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="类型">
+              <span class="white">{{ invoiceStatusName(selectedRow.contracttype) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="发票金额">
+              <span class="white">{{ formatValue(selectedRow.InvoiceAmount) }}</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.InvoiceAmount) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登记时间">
+              <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
-import {defineComponent, PropType, reactive, ref, watchEffect} from 'vue';
-import {closeModal} from '@/common/setup/modal/index';
-import {QueryCustomInfoType} from '@/services/go/ermcp/customInfo/interface';
-import {mergeObj} from '@/utils/objHandle';
-import {getStatusName} from '@/views/information/custom/setup';
-import {formatValue, formatTime} from '@/common/methods';
-import {QryBussinessFpRsp} from "@/services/go/ermcp/finance-review/interface";
-import {invoiceStatusName} from "@/views/manage/finance-review/setup";
-import {getContractTypeName, getPriceTypeName} from "@/views/information/spot-contract/setup";
+import { defineComponent, PropType, reactive, ref, watchEffect } from 'vue';
+import { closeModal } from '@/common/setup/modal/index';
+import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+import { mergeObj } from '@/utils/objHandle';
+import { getStatusName } from '@/views/information/custom/setup';
+import { formatValue, formatTime } from '@/common/methods';
+import { QryBussinessFpRsp } from '@/services/go/ermcp/finance-review/interface';
+import { invoiceStatusName } from '@/views/manage/finance-review/setup';
+import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
 
 export default defineComponent({
     name: 'finance_review_invoice_detail',
@@ -105,15 +105,14 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const {visible, cancel} = closeModal('detail');
+        const { visible, cancel } = closeModal('detail');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
 
         function submit() {
-            console.log(props)
-            debugger
+            console.log(props);
             context.emit('refresh');
-            cancel()
+            cancel();
         }
 
         return {

src/views/search/inventory/components/filterTable/index.vue

@@ -60,10 +60,10 @@ export default defineComponent({
                     return { value: deliverygoodsid, lable: deliverygoodsname };
                 });
         });
-        function DGChange(value: any) {
+        function DGChange(id: number) {
             select.value[1].value = undefined;
             select.value[2].value = undefined;
-            const temp = APP.get('DeliveryGoodsList').find((el: ErmcpDeliveryGoodsDetailEx) => el.data.deliverygoodsid === value.key);
+            const temp = APP.get('DeliveryGoodsList').find((el: ErmcpDeliveryGoodsDetailEx) => el.data.deliverygoodsid === id);
             if (temp) {
                 select.value[1].list = temp.gmlist.map((e: Ermcp3Wrstandard) => {
                     const { wrstandardid, wrstandardname } = e;

src/views/search/inventory/list/inventory_applyrecord/index.vue

@@ -82,7 +82,7 @@ export default defineComponent({
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_delivery', ['deliverygoodsid', 'wrstandardid', 'spotgoodsbrandid', 'warehouseinfoid']);
+            registerColumn('table_pcweb_application_record', ['deliverygoodsid', 'wrstandardid', 'spotgoodsbrandid', 'warehouseinfoid']);
         });
         return {
             columns,

src/views/search/inventory/list/inventory_current/index.vue

@@ -61,7 +61,7 @@ export default defineComponent({
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_delivery', ['deliverygoodsid', 'wrstandardid', 'spotgoodsbrandid', 'warehouseinfoid']);
+            registerColumn('table_pcweb_current_inventory', ['deliverygoodsid', 'wrstandardid', 'spotgoodsbrandid', 'warehouseinfoid']);
         });
         return {
             columns,