update

src/views/business/plan/components/audit/index.vue

@@ -39,11 +39,6 @@
                             <span class="white">{{ formatValue(selectedRow.planqty) }}</span>
                         </a-form-item>
                     </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="标仓系数">
-                            <span class="white">{{ formatValue(selectedRow.convertfactor) }}</span>
-                        </a-form-item>
-                    </a-col>
                 </a-row>
                 <a-row :gutter="24">
                     <a-col :span="12">

src/views/business/plan/components/delete/index.vue

@@ -38,11 +38,6 @@
               <span class="white">{{ formatValue(selectedRow.planqty) }}</span>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
-            <a-form-item label="标仓系数">
-              <span class="white">{{ formatValue(selectedRow.convertfactor) }}</span>
-            </a-form-item>
-          </a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">

src/views/business/plan/components/detail/index.vue

@@ -48,11 +48,6 @@
               <span class="white">{{ formatValue(selectedRow.planqty) }}</span>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
-            <a-form-item label="标仓系数">
-              <span class="white">{{ formatValue(selectedRow.convertfactor) }}</span>
-            </a-form-item>
-          </a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">

src/views/business/plan/components/recommit/index.vue

@@ -39,11 +39,6 @@
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="标仓系数" name="">
-            <a-input class="dialogInput ConvertFactor" v-model:value="formState.ConvertFactor" readonly style="width: 200px" placeholder="请输入标仓系数" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
           <a-form-item label="计划量" class="relative" name="PlanQty">
             <a-input class="dialogInput" style="width: 200px" v-model:value="formState.PlanQty" placeholder="请输入计划量" />
           </a-form-item>

src/views/manage/finance-review/list/invoice/index.vue

@@ -19,6 +19,10 @@
       <template #applystatus="{ text }">
         <a>{{ getApplyStatusName(text) }}</a>
       </template>
+      <!-- 发票附件 -->
+      <template #attachurl="{text}" class="attachurl">
+          {{text}}
+      </template>
       <!-- 点价类型 -->
       <template #operateapplytype="{ text }">
         <a>{{ operateApplyTypeName(text) }}</a>
@@ -140,4 +144,9 @@ export default defineComponent({
         };
     },
 });
-</script>
+</script>
+<style scoped>
+.attachurl{
+    white-space:nowrap
+}
+</style>

src/views/report/components/filter/index.vue

@@ -16,7 +16,7 @@
                     {{ item.lable }}
                 </a-select-option>
             </a-select>
-            <slot></slot>
+            <slot :reset="reset" :search="search"></slot>
         </div>
     </div>
 </template>
@@ -42,10 +42,26 @@ export default defineComponent({
     },
     setup(props, context) {
         const { selectedReportType, reportType, reportTypeChange, isMonth, timeChange, dateFormat, time, selectedUser, userChange } = handleReprotType(context);
+        const oldSelectedReportType=selectedReportType.value
+        const oldSelectedUser=selectedUser.value
+        const oldTime=time.value
         const loading = ref<boolean>(false);
         // 交易用户
         const userList = ref<SelectOption[]>([]);
         const { queryTable } = handlerManagerList(loading, 2);
+        function reset() { //重置
+            selectedReportType.value=oldSelectedReportType
+            selectedUser.value=oldSelectedUser
+            time.value=oldTime
+            userChange()
+            timeChange()
+            reportTypeChange()
+        }
+        function search() {
+
+
+        }
+
         initData(() => {
             // 处理刷新
             selectedUser.value.key = getUserId();
@@ -79,6 +95,8 @@ export default defineComponent({
             isMonth,
             time,
             userList,
+            reset,
+            search
         };
     },
 });

src/views/report/setup.ts

@@ -11,12 +11,15 @@ import { Value } from "./interface"
 
 export function handleReprotType(context: SetupContext) {
     // 选中的周期类型
+    // 
     const selectedReportType = ref<Value>({ key: reportCycleType.day })
     // 时间格式化类型
     const dateFormat = ref<reportCyleTimeType>(reportCyleTimeType.day)
     // 时间
+    // 
     const time = ref<Moment>(getInitTime());
     // 交易用户
+    // 
     const selectedUser = ref<Value>({ key: getUserId() })
     // 周期类型与时间类型 一对一的关系
     const timeMap = new Map([

src/views/report/spot-report/components/filterTable/index.vue

@@ -1,6 +1,6 @@
 <template>
     <!-- 过滤客户资料表格 -->
-    <Filter @update="update">
+    <Filter @update="update" ref="filter" v-slot="{search,reset}">
         <a-select label-in-value class="conditionSelect ml10" style="width: 120px" v-model:value="selectedDG" @change="DGChange" placeholder="全部现货品种">
             <a-select-option v-for="item in DGList" :key="item.data.deliverygoodsname">
                 {{ item.data.deliverygoodsname }}
@@ -17,14 +17,14 @@
             </a-select-option>
         </a-select>
         <a-button class="selectBtn">查询</a-button>
-        <a-button class="selectBtn" @click="reset">重置</a-button>
+        <a-button class="selectBtn" @click="resetAction(search,reset)">重置</a-button>
     </Filter>
 </template>
 
 <script lang="ts">
 import FilterOption from '@/common/components/filter/index.vue';
 import { defineComponent } from 'vue';
-import { ref } from 'vue';
+import { ref ,onMounted } from 'vue';
 import { handleFilter, SelectList } from '@/common/setup/filter';
 import { handlerManagerList } from '@/common/setup/user';
 import { QueryMiddleGoodsDetail } from '@/services/go/ermcp/goodsInfo';
@@ -40,8 +40,18 @@ export default defineComponent({
         function update(value: TypeAndTime) {
             context.emit('update', value);
         }
+
+        let filter = ref(null);
+        onMounted(()=>{
+        console.log(filter.value)
+        });
         const { DGList, gblist, gmlist, selectedDG, selectedGB, selectedGM, DGChange, GBOrGMChange, reset } = handleDG(context);
+        function resetAction(search:Function,Nreset:Function) {
+            Nreset()
+            reset()
+        }
         return {
+            filter,
             DGList,
             gblist,
             gmlist,
@@ -52,6 +62,7 @@ export default defineComponent({
             selectedGB,
             selectedGM,
             update,
+            resetAction,
         };
     },
 });

src/views/report/spot-report/list/spot_report/index.vue

@@ -3,7 +3,9 @@
   <div class="table-detail-container table-height"
        :loading="loading">
     <Filter @update="search"
-            @filter="updateColumn"></Filter>
+            @filter="updateColumn"
+            :tableList="tableList"
+            ></Filter>
     <a-table :columns="columns"
              class="srcollYTable"
              :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"