no message

src/views/business/contracts/simpleCompany/index.vue

@@ -97,7 +97,7 @@
     </div>
 </template>
 
-<script setup name="Company">
+<script setup name="SimpleCompany">
 import { listCompany, delCompany } from "@/api/business/crm/company";
 import companyForm from "./form"
 const { proxy } = getCurrentInstance()

src/views/business/deduction/index.vue

@@ -234,24 +234,24 @@
   </div>
 </template>
 
-<script setup name="Company">
-  import {
-    listDeduction,
-    exportDeposition,
-    saveDeduction
-  } from "@/api/business/production/deduction";
-  import MergeTaxViewDialog from "./MergeTaxViewDialog";
-  import feedbackDialog from "./feedbackDialog";
-  import { uploadFile } from "@/api/tool/file";
-  import { rowNum } from "@/utils/index";
-  import { listCompany } from "@/api/business/crm/company";
-  import { taxTypes } from "@/utils/default";
-  import useUserStore from "@/store/modules/user";
-  import { getTenant } from "@/utils/auth";
-  import { ref } from "vue";
-  import FileDialog from "../../dialog/fileDialog.vue";
-  import HousingFundViewDialog from "./HousingFundViewDialog";
-  import SocialSecurityViewDialog from "./SocialSecurityViewDialog";
+<script setup name="Deduction">
+import {
+  listDeduction,
+  exportDeposition,
+  saveDeduction
+} from "@/api/business/production/deduction";
+import MergeTaxViewDialog from "./MergeTaxViewDialog";
+import feedbackDialog from "./feedbackDialog";
+import { uploadFile } from "@/api/tool/file";
+import { rowNum } from "@/utils/index";
+import { listCompany } from "@/api/business/crm/company";
+import { taxTypes } from "@/utils/default";
+import useUserStore from "@/store/modules/user";
+import { getTenant } from "@/utils/auth";
+import { ref } from "vue";
+import FileDialog from "../../dialog/fileDialog.vue";
+import HousingFundViewDialog from "./HousingFundViewDialog";
+import SocialSecurityViewDialog from "./SocialSecurityViewDialog";
 
   // import DepositForm from "./form"
   const { proxy } = getCurrentInstance();

src/views/business/entrust/deduct/index.vue

@@ -123,7 +123,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="Deduct">
 // import contractForm from "./form";
 import {
   listDeduct,

src/views/business/entrust/deductOfFactory/index.vue

@@ -124,7 +124,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="General">
 import {
   listEntrustOrder,
   exportEntrustOrder,

src/views/business/entrust/deposit/index.vue

@@ -320,7 +320,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="Deposit">
 import {
   listDeposit,
   delDeposit,

src/views/business/entrust/depositOfFactory/index.vue

@@ -281,7 +281,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="PrevDeposit">
 // import contractForm from "./form";
 import {
   listDeposit,

src/views/business/entrust/entrustOrder/index.vue

@@ -202,7 +202,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="EntrustOrder">
 import {
   listEntrustOrder,
   exportEntrustOrder,

src/views/business/entrust/workOrder/currentMonth/index.vue

@@ -116,7 +116,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="CurrentMonthWorkOrder">
   import InitMonthDialog from "../initMonthDialog";
   import exports from "./export.vue"
   import { getToken, getTenant } from "@/utils/auth";

src/views/business/entrust/workOrder/historyMonth/index.vue

@@ -96,7 +96,7 @@
     </div>
 </template>
 
-<script setup name="Company">
+<script setup name="HistoryWorkOrder">
     import InitMonthDialog from "../initMonthDialog";
     import { getToken, getTenant } from "@/utils/auth";
     import {

src/views/business/entrust/workOrder/nextMonth/index.vue

@@ -197,7 +197,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="NextMonthWorkOrder">
 import InitMonthDialog from "../initMonthDialog";
 import exports from "./export.vue"
 import {

src/views/business/entrust/workOrder/once/index.vue

@@ -147,7 +147,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="OnceWorkOrder">
 import {
   listOnceWorkOrder,
   checkCurrent,

src/views/business/entrust/workOrderForFactory/currentMonth/index.vue

@@ -103,7 +103,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="CurrentWorkOrderForFactory">
   import { getToken, getTenant } from "@/utils/auth";
   import {
     listFactoryCurrentWorkOrder,

src/views/business/entrust/workOrderForFactory/history/index.vue

@@ -94,7 +94,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="HistoryWorkOrderForFactory">
   import InitMonthDialog from "../initMonthDialog";
   import { getToken, getTenant } from "@/utils/auth";
   import {

src/views/business/entrust/workOrderForFactory/nextMonth/index.vue

@@ -153,7 +153,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="NextWorkOrderForFactory">
 import { getToken, getTenant } from "@/utils/auth";
 import useUserStore from "@/store/modules/user";
 

src/views/business/financial/collection/index.vue

@@ -227,7 +227,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="Collection">
 import contractForm from "./form";
 import {
   listCollection,

src/views/business/financial/payment/index.vue

@@ -238,7 +238,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="Payment">
 import paymentForm from "./form";
 import { listPayment, exportPayment } from "@/api/business/financial/payment";
 const { proxy } = getCurrentInstance();

src/views/business/housingFund/confirm/index.vue

@@ -176,7 +176,7 @@
   </div>
 </template>
 
-<script setup>
+<script setup name="HousingFundConfirm">
   import useUserStore from "@/store/modules/user";
   import {
     listHousingFundConfirm,

src/views/business/housingFund/declare/index.vue

@@ -204,6 +204,7 @@
   </div>
 </template>
 
+<<<<<<< HEAD
 <script setup>
   import useUserStore from "@/store/modules/user";
   import {
@@ -240,6 +241,44 @@
   const viewDialogRef = ref(null);
   const memeberDialogRef = ref(null);
   const fileListDialogRef = ref(null);
+=======
+<script setup name="HousingFundDeclare">
+import useUserStore from "@/store/modules/user";
+import {
+  listHousingFundDeclare,
+  turnBackDetail,
+  exportHoisngFundDeclare,
+} from "@/api/business/production/housingFundDeclare";
+import { uploadFile } from "@/api/tool/file";
+import { listCompany } from "@/api/business/crm/company";
+import { ref } from "vue";
+import formDialog from "./form";
+import { taxTypes } from "@/utils/default";
+import viewDialog from "./view";
+import memberDialog from "../memberDialog";
+import FileListDialog from "../fileListDialog.vue";
+const { proxy } = getCurrentInstance();
+/** 字典数组区 */
+/** 查询 对象 */
+const tenant = useUserStore().tenant;
+const orderList = ref([]);
+const loading = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const oneself = ref(false);
+const total = ref(0);
+const prev = ref([]);
+const baseUrl = ref(import.meta.env.VITE_APP_BASE_API);
+const showViewer = ref(false);
+const currentFileList = ref([]);
+const moreSearch = ref(false);
+const showIndex = ref(0);
+const formDialogRef = ref(null);
+const viewDialogRef = ref(null);
+const memeberDialogRef = ref(null);
+const fileListDialogRef = ref(null);
+>>>>>>> dev2
 
   const formOpen = ref(false);
   const currentMonth = ref(proxy.moment().format("YYYY-MM-01"));

src/views/business/paymentEntry/type/index.vue

@@ -279,7 +279,7 @@
   </div>
 </template>
 
-<script setup name="Type">
+<script setup name="PaymentEntry">
 import {
   listType,
   delType,

src/views/business/production/IndividualIncomeTaxIs/index.vue

@@ -227,7 +227,7 @@
   </div>
 </template>
 
-<script setup name="Detail">
+<script setup name="IndividualIncomeTax">
   import {
     listDetail,
     delDetail,

src/views/business/production/IndividualIncomeTaxIsZero/index.vue

@@ -226,7 +226,7 @@
   </div>
 </template>
 
-<script setup name="DetailZero">
+<script setup name="IndividualIncomeTaxIsZero">
   import {
     listDetail,
     delDetail,

src/views/business/production/archiveTicket/index.vue

@@ -146,34 +146,34 @@
   </div>
 </template>
 
-<script setup name="Company">
-  import { listLableNoPage } from "@/api/business/lable"
-  import { listArchiveTicket } from "@/api/business/production/archiveTicket";
-  import { uploadFile } from "@/api/tool/file";
-  import { listCompany } from "@/api/business/crm/company";
-  import useUserStore from "@/store/modules/user";
-  import { getTenant } from "@/utils/auth";
-  import { ref } from "vue";
-  import formDialog from "./form.vue";
-  import viewDialog from "./view.vue";
-  const { proxy } = getCurrentInstance();
-  /** 字典数组区 */
-  /** 查询 对象 */
-  const tenant = useUserStore().tenant
-  const list = ref([]);
-  const loading = ref(true);
-  const ids = ref([]);
-  const single = ref(true);
-  const multiple = ref(true);
-  const oneself = ref(false);
-  const total = ref(0);
-  const prev = ref([]);
-  const baseUrl = ref(import.meta.env.VITE_APP_BASE_API);
-  const showViewer = ref(false);
-  const currentFileList = ref([]);
-  const showIndex = ref(0);
-  const queryRadio = ref("全部");
-  const permissions = useUserStore().permissions;
+<script setup name="ArchiveReceiveTicket">
+import { listLableNoPage } from "@/api/business/lable"
+import { listArchiveTicket } from "@/api/business/production/archiveTicket";
+import { uploadFile } from "@/api/tool/file";
+import { listCompany } from "@/api/business/crm/company";
+import useUserStore from "@/store/modules/user";
+import { getTenant } from "@/utils/auth";
+import { ref } from "vue";
+import formDialog from "./form.vue";
+import viewDialog from "./view.vue";
+const { proxy } = getCurrentInstance();
+/** 字典数组区 */
+/** 查询 对象 */
+const tenant = useUserStore().tenant
+const list = ref([]);
+const loading = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const oneself = ref(false);
+const total = ref(0);
+const prev = ref([]);
+const baseUrl = ref(import.meta.env.VITE_APP_BASE_API);
+const showViewer = ref(false);
+const currentFileList = ref([]);
+const showIndex = ref(0);
+const queryRadio = ref("全部");
+const permissions = useUserStore().permissions;
 
   const currentMonth = ref(
     proxy.moment().subtract(1, "month").format("YYYY-MM-01")

src/views/business/production/financialReportTax/index.vue

@@ -224,7 +224,7 @@
   </div>
 </template>
 
-<script setup name="Tax">
+<script setup name="FinancialReportTax">
   import {
     selectMonths,
     selectStatus,

src/views/business/production/financialReportTaxIsZero/index.vue

@@ -376,7 +376,7 @@
   </div>
 </template>
 
-<script setup name="Tax">
+<script setup name="FinancialReportTaxIsZero">
 import {
   selectMonths,
   selectStatus,

src/views/business/production/keepAccount/index.vue

@@ -197,7 +197,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="KeepAccount">
   import useUserStore from "@/store/modules/user";
   import { taxTypes } from "@/utils/default";
   import {

src/views/business/production/onceWork/index.vue

@@ -64,12 +64,12 @@
         min-width="150"
       /> -->
       <el-table-column label="来源" align="center" prop="accountName" min-width="150" v-if="tenant.versionId == '4'" />
-      <el-table-column label="工单类型" align="center" prop="amount" width="80">
+      <!-- <el-table-column label="工单类型" align="center" prop="amount" width="80">
         <template #default="scope">
           {{ scope.row.type === 1 ? "循环工单" : "代办工单" }}
         </template>
-      </el-table-column>
-      <el-table-column label="项目" align="center" width="200" :show-overflow-tooltip="true">
+      </el-table-column> -->
+      <el-table-column label="项目" align="center"  width="200" :show-overflow-tooltip="true">
         <template #default="scope">
           {{
           scope.row.noContract === 1? scope.row.remark: `${scope.row.taskTypeName}${scope.row.alterType
@@ -203,7 +203,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="OnceWork">
 
 
   import {

src/views/business/production/productionCompany/index.vue

@@ -62,7 +62,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="ProductionCompany">
 import {
   listProductionCompany,
   delCompany,demo

src/views/business/production/receiveTicket/index.vue

@@ -246,7 +246,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="Receive">
   import useUserStore from "@/store/modules/user";
 
   import {

src/views/business/production/receiveTicketFeedback/index.vue

@@ -137,7 +137,7 @@ width="50"
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="ReceiveTicketFeedback">
   // import contractForm from "./form";
   import {
     listReceiveTicketFeedback,

src/views/business/production/salary/index.vue

@@ -212,7 +212,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="Salary">
   import useUserStore from "@/store/modules/user";
   import { taxTypes } from "@/utils/default";
   import { listSalary, exportSalary } from "@/api/business/production/salary";

src/views/business/production/salaryZero/index.vue

@@ -205,7 +205,7 @@
   </div>
 </template>
 
-<script setup name="Company">
+<script setup name="SalaryZero">
   import useUserStore from "@/store/modules/user";
   import { taxTypes } from "@/utils/default";
   import { listSalary, exportSalary } from "@/api/business/production/salaryZero";

src/views/business/socialSecurity/confirm/index.vue

@@ -179,7 +179,7 @@
   </div>
 </template>
 
-<script setup>
+<script setup name="SocialSecurityConfirm">
   import useUserStore from "@/store/modules/user";
   import {
     listSocialSecurityConfirm,

src/views/business/socialSecurity/declare/index.vue

@@ -197,7 +197,7 @@
   </div>
 </template>
 
-<script setup>
+<script setup name="SocialSecurityDeclare">
   import useUserStore from "@/store/modules/user";
   import {
     listSocialSecurityDeclare,