Merge branch 'master' of http://git.cc-lotus.info/studio_vue3/jcyjdt_studio

src/views/unit/applyflair/add.vue

@@ -23,9 +23,9 @@
 <script setup lang="ts">
 import store from '@/stores/counter';
 // #region 组件
-import partsSearch from '@/components/c-search.vue';
-import CForm from '@/components/c-form.vue';
-import CFile from '@/components/c-upload.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
+import CForm from '@common/src/components/frame/c-form.vue';
+import CFile from '@common/src/components/frame/c-upload.vue';
 // #endregion
 import type { Ref } from 'vue';
 import { ref, onMounted, reactive } from 'vue';

src/views/unit/applyflair/index.vue

@@ -35,9 +35,9 @@
 <script setup lang="ts">
 import store from '@/stores/counter';
 // #region 组件
-import partsSearch from '@/components/c-search.vue';
-import CTable from '@/components/c-table.vue';
-import Btn1 from '@/components/btn-1.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
+import CTable from '@common/src/components/frame/c-table.vue';
+import Btn1 from '@common/src/components/frame/btn-1.vue';
 // #endregion
 import type { Ref } from 'vue';
 import { ref, onMounted, getCurrentInstance } from 'vue';

src/views/unit/builddesire/add.vue

@@ -113,7 +113,7 @@
 import store from '@/stores/counter';
 import moment from 'moment';
 // #region 组件
-import partsSearch from '@/components/c-search.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
 // #endregion
 import type { Ref } from 'vue';
 import { ref, onMounted, reactive } from 'vue';

src/views/unit/builddesire/index.vue

@@ -53,10 +53,10 @@
 import store from '@/stores/counter';
 import { ElMessage } from 'element-plus';
 // #region 组件
-import partsSearch from '@/components/c-search.vue';
-import CTable from '@/components/c-table.vue';
-import CDialog from '@/components/c-dialog.vue';
-import Btn1 from '@/components/btn-1.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
+import CTable from '@common/src/components/frame/c-table.vue';
+import CDialog from '@common/src/components/frame/c-dialog.vue';
+import Btn1 from '@common/src/components/frame/btn-1.vue';
 // #endregion
 import type { Ref } from 'vue';
 import { ref, onMounted, getCurrentInstance } from 'vue';

src/views/unit/contactoffice/index.vue

@@ -13,7 +13,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import partsSearch from '@/components/c-search.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
 import type { Ref } from 'vue';
 import { ref, onMounted } from 'vue';
 import { ElMessage } from 'element-plus';

src/views/unit/demand/add.vue

@@ -29,10 +29,10 @@
 <script setup lang="ts">
 import store from '@/stores/counter';
 // #region 组件
-import partsSearch from '@/components/c-search.vue';
-import CForm from '@/components/c-form.vue';
-import CFile from '@/components/c-upload.vue';
-import WangEditor from '@/components/wang-editor.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
+import CForm from '@common/src/components/frame/c-form.vue';
+import CFile from '@common/src/components/frame/c-upload.vue';
+import WangEditor from '@common/src/components/frame/wang-editor.vue';
 // #endregion
 import type { Ref } from 'vue';
 import { ref, onMounted, reactive } from 'vue';

src/views/unit/demand/index.vue

@@ -41,9 +41,9 @@
 <script setup lang="ts">
 import store from '@/stores/counter';
 // #region 组件
-import partsSearch from '@/components/c-search.vue';
-import CTable from '@/components/c-table.vue';
-import Btn1 from '@/components/btn-1.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
+import CTable from '@common/src/components/frame/c-table.vue';
+import Btn1 from '@common/src/components/frame/btn-1.vue';
 // #endregion
 import type { Ref } from 'vue';
 import { ref, onMounted, getCurrentInstance } from 'vue';

src/views/unit/demand/info.vue

@@ -13,7 +13,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import partsSearch from '@/components/c-search.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
 import demandInfo from '@/components/common/demand/info.vue';
 import { useRoute } from 'vue-router';
 import type { Ref } from 'vue';

src/views/unit/scientist/add.vue

@@ -71,9 +71,9 @@
 import store from '@/stores/counter';
 import moment from 'moment';
 // #region 组件
-import partsSearch from '@/components/c-search.vue';
-import CForm from '@/components/c-form.vue';
-import CFile from '@/components/c-upload.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
+import CForm from '@common/src/components/frame/c-form.vue';
+import CFile from '@common/src/components/frame/c-upload.vue';
 // #endregion
 import type { Ref } from 'vue';
 import { ref, onMounted, reactive } from 'vue';

src/views/unit/scientist/index.vue

@@ -30,8 +30,8 @@
 import store from '@/stores/counter';
 import { ElMessage } from 'element-plus';
 // #region 组件
-import partsSearch from '@/components/c-search.vue';
-import CTable from '@/components/c-table.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
+import CTable from '@common/src/components/frame/c-table.vue';
 // #endregion
 import type { Ref } from 'vue';
 import { ref, onMounted, getCurrentInstance } from 'vue';

src/views/unit/studio/add.vue

@@ -38,7 +38,7 @@
 <script setup lang="ts">
 import store from '@/stores/counter';
 // #region 组件
-import partsSearch from '@/components/c-search.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
 import studioInfo from '@/components/common/studio/info.vue';
 import form1 from './parts/form-1.vue';
 import form2 from './parts/form-2.vue';

src/views/unit/studio/index.vue

@@ -33,9 +33,9 @@
 import store from '@/stores/counter';
 import { ElMessage } from 'element-plus';
 // #region 组件
-import partsSearch from '@/components/c-search.vue';
-import CTable from '@/components/c-table.vue';
-import Btn1 from '@/components/btn-1.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
+import CTable from '@common/src/components/frame/c-table.vue';
+import Btn1 from '@common/src/components/frame/btn-1.vue';
 // #endregion
 import type { Ref } from 'vue';
 import { ref, onMounted, getCurrentInstance } from 'vue';

src/views/unit/studio/parts/form-2.vue

@@ -101,7 +101,7 @@
 
 <script setup lang="ts">
 // #region 组件
-import CFile from '@/components/c-upload.vue';
+import CFile from '@common/src/components/frame/c-upload.vue';
 // #endregion
 import moment from 'moment';
 import type { Ref } from 'vue';

src/views/unit/studio/parts/form-3.vue

@@ -18,7 +18,7 @@
 
 <script setup lang="ts">
 // #region 组件
-import CFile from '@/components/c-upload.vue';
+import CFile from '@common/src/components/frame/c-upload.vue';
 // #endregion
 import type { Ref } from 'vue';
 import { ref, toRefs, reactive } from 'vue';

src/views/unit/yearreport/add.vue

@@ -23,9 +23,9 @@
 <script setup lang="ts">
 import store from '@/stores/counter';
 // #region 组件
-import partsSearch from '@/components/c-search.vue';
-import CForm from '@/components/c-form.vue';
-import CFile from '@/components/c-upload.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
+import CForm from '@common/src/components/frame/c-form.vue';
+import CFile from '@common/src/components/frame/c-upload.vue';
 // #endregion
 import type { Ref } from 'vue';
 import { ref, onMounted, reactive } from 'vue';

src/views/unit/yearreport/index.vue

@@ -35,9 +35,9 @@
 <script setup lang="ts">
 import store from '@/stores/counter';
 // #region 组件
-import partsSearch from '@/components/c-search.vue';
-import CTable from '@/components/c-table.vue';
-import Btn1 from '@/components/btn-1.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
+import CTable from '@common/src/components/frame/c-table.vue';
+import Btn1 from '@common/src/components/frame/btn-1.vue';
 // #endregion
 import type { Ref } from 'vue';
 import { ref, onMounted, getCurrentInstance } from 'vue';

src/views/user/scientist/studio/index.vue

@@ -30,8 +30,8 @@
 import store from '@/stores/counter';
 import { ElMessage } from 'element-plus';
 // #region 组件
-import partsSearch from '@/components/c-search.vue';
-import CTable from '@/components/c-table.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
+import CTable from '@common/src/components/frame/c-table.vue';
 // #endregion
 import type { Ref } from 'vue';
 import { ref, onMounted, getCurrentInstance } from 'vue';

src/views/user/scientist/studio/info.vue

@@ -13,7 +13,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import partsSearch from '@/components/c-search.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
 import studioInfo from '@/components/common/studio/info.vue';
 import { useRoute } from 'vue-router';
 import type { Ref } from 'vue';

src/views/user/support/add.vue

@@ -29,10 +29,10 @@
 <script setup lang="ts">
 import store from '@/stores/counter';
 // #region 组件
-import partsSearch from '@/components/c-search.vue';
-import CForm from '@/components/c-form.vue';
-import CFile from '@/components/c-upload.vue';
-import WangEditor from '@/components/wang-editor.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
+import CForm from '@common/src/components/frame/c-form.vue';
+import CFile from '@common/src/components/frame/c-upload.vue';
+import WangEditor from '@common/src/components/frame/wang-editor.vue';
 // #endregion
 import type { Ref } from 'vue';
 import { ref, onMounted, reactive } from 'vue';

src/views/user/support/index.vue

@@ -41,9 +41,9 @@
 <script setup lang="ts">
 import store from '@/stores/counter';
 // #region 组件
-import partsSearch from '@/components/c-search.vue';
-import CTable from '@/components/c-table.vue';
-import Btn1 from '@/components/btn-1.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
+import CTable from '@common/src/components/frame/c-table.vue';
+import Btn1 from '@common/src/components/frame/btn-1.vue';
 // #endregion
 import type { Ref } from 'vue';
 import { ref, onMounted, getCurrentInstance } from 'vue';

src/views/user/support/info.vue

@@ -13,7 +13,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import partsSearch from '@/components/c-search.vue';
+import partsSearch from '@common/src/components/frame/c-search.vue';
 import supportInfo from '@/components/common/support/info.vue';
 import { useRoute } from 'vue-router';
 import type { Ref } from 'vue';