Merge branch 'weiqiao-vue3' of https://git.rokedata.com/jinmin/weiqiao-vue into weiqiao-vue3

xjrsoft-vue3/src/api/jcsj/gxgl/model/GxglModel.ts

@@ -6,11 +6,11 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
 export interface RokeProcessPageParams extends BasicPageParams {
   name: string;
 
-  categoryId: string;
+  defaultReporter: string;
 
-  processType: string;
+  categoryId: string;
 
-  collectionItem: string;
+  collectionSchemeId: string;
 
   note: string;
 }
@@ -25,10 +25,10 @@ export interface RokeProcessPageModel {
 
   categoryId: string;
 
-  processType: string;
-
   collectionSchemeId: string;
 
+  ratedWorkingHours: string;
+
   note: string;
 }
 

xjrsoft-vue3/src/api/scgl/scjh/model/ScjhModel.ts

@@ -19,8 +19,6 @@ export interface MesProductionPlanPageModel {
 
   jhbh: string;
 
-  khxmh: string;
-
   ddbh: string;
 
   kh: string;

xjrsoft-vue3/src/views/jcsj/gxgl/index.vue

@@ -2,8 +2,29 @@
 <template>
 
 
-<ResizePageWrapper   :hasLeft="false">
+<ResizePageWrapper   :hasLeft="true" :formLeftWidth="300">
+ <template #resizeLeft>
  
+        <BasicTree
+          title=""
+          toolbar
+          search
+          switcher
+          :clickRowToExpand="true"
+          :treeData="treeData"
+          :fieldNames="{ key: 'value', title: 'name' }"
+          @select="handleSelect"
+        >
+          <template #title="item">
+          
+          <template v-if="item.renderIcon === 'childIcon'">
+                  <Icon icon="ant-design:branches-outlined" />
+                </template>
+            &nbsp;&nbsp;{{ item.name }}
+          </template>
+        </BasicTree>
+        
+ </template>
  
  <template #resizeRight>
 <BasicTable @register="registerTable" isMenuTable ref="tableRef"  
@@ -60,7 +81,7 @@
 
 </template>
 <script lang="ts" setup>
-  import { ref, computed,provide,Ref, createVNode, 
+  import { ref, computed,provide,Ref, onMounted,createVNode, 
 } from 'vue';
   
   import { Modal } from 'ant-design-vue';
@@ -95,8 +116,8 @@
   
   import Icon from '/@/components/Icon/index';
    
-   
-  
+  import { BasicTree, TreeItem } from '/@/components/Tree'; 
+  import { getDicDetailList } from '/@/api/system/dic';
   
   
   
@@ -154,8 +175,8 @@
   const formIdComputedRef = computed(() => currentRoute.value.meta.formId as string);
   provide<Ref<string>>('currentFormId', formIdComputedRef);
   
-   
-   
+  const selectId = ref(''); 
+  const treeData = ref<TreeItem[]>([]); 
   
   
    
@@ -214,6 +235,11 @@
 
   
   
+  onMounted(() => {
+  fetch();
+  
+    });
+  
 
   function buttonClick(code) {
     
@@ -326,6 +352,31 @@
   
   
   
+  function handleSelect(selectIds) {
+    selectId.value = selectIds[0];
+    
+        
+          reload({ searchInfo: { categoryId: selectIds[0] } });
+    
+    
+  }
+  async function fetch() {
+    treeData.value = (await getDicDetailList({
+      itemId: '2005547790246666242',
+    })) as unknown as TreeItem[];
+    
+    
+    
+    
+    addRenderIcon(treeData.value);
+  }
+  
+  function addRenderIcon(data) {
+    data.map((item) => {
+      if (item.children?.length) addRenderIcon(item.children);
+      return (item.renderIcon = item.children?.length ? 'parentIcon' : 'childIcon');
+    });
+  }
   function getLessActions(record: Recordable) {
     let list = getActions(record);
     return list.slice(0, listSpliceNum.value);

xjrsoft-vue3/src/views/scgl/scjh/components/config.ts

@@ -48,19 +48,6 @@ export const columns: BasicColumn[] = [
 
   {
     resizable: true,
-    dataIndex: 'khxmh',
-    title: '客户项目号',
-    componentType: 'input',
-
-    fixed: false,
-    sorter: true,
-
-    styleConfig: undefined,
-    listStyle: '',
-  },
-
-  {
-    resizable: true,
     dataIndex: 'ddbh',
     title: '订单编号',
     componentType: 'input',
@@ -82,7 +69,7 @@ export const columns: BasicColumn[] = [
     sorter: true,
 
     styleConfig: undefined,
-    listStyle: undefined,
+    listStyle: '',
   },
 
   {
@@ -565,6 +552,15 @@ export const formProps: FormProps = {
                     component: '0973f42360874c6e86f425a363afd8ad',
                     bindTable: 'mes_production_plan_product_rela',
                   },
+                  {
+                    name: 'hjzt',
+                    tableTitle: '合金状态',
+                    bindField: 'heJinZhuangTai4056',
+                    show: true,
+                    width: 150,
+                    component: 'e466da29e7544bdba302b4829996f478',
+                    bindTable: 'mes_production_plan_product_rela',
+                  },
                 ],
               },
               dicOptions: [],

xjrsoft-vue3/src/views/sys/login/Login.vue

@@ -28,17 +28,7 @@
     <div class="right-top-box">
       <img src="../../../assets/images/login-right.gif" />
     </div>
-    <div class="copyright"
-      >Copyright © 长沙力软信息技术有限公司,<br />
-      All Rights Reserved.
-      <a
-        href="https://beian.miit.gov.cn/"
-        style="white-space: nowrap; color: inherit; text-decoration: none"
-        target="_blank"
-        >湘ICP备19021782号-1</a
-      >
-      助企业和团队快速实现目标</div
-    >
+    <div class="copyright">Copyright © 和利时科技集团有限公司<br /></div>
   </div>
 </template>
 <script lang="ts" setup>