修改bug

xjrsoft-vue3/src/api/jcsj/bkxx/index.ts

@@ -66,7 +66,7 @@ export async function updateRokeDepartment(rokeDepartment: Recordable, mode: Err
     {
     {
       url: Api.RokeDepartment,
       url: Api.RokeDepartment,
       params: rokeDepartment,
       params: rokeDepartment,
-    },
+    },  
     {
     {
       errorMessageMode: mode,
       errorMessageMode: mode,
     },
     },

xjrsoft-vue3/src/locales/lang/zh-CN/sys.ts

@@ -74,7 +74,7 @@ export default {
     registerButton: '注册',
     registerButton: '注册',
     rememberMe: '记住我',
     rememberMe: '记住我',
     forgetPassword: '忘记密码?',
     forgetPassword: '忘记密码?',
-    otherSignIn: '其他登录方式',
+    // otherSignIn: '其他登录方式',
 
 
     // notify
     // notify
     loginSuccessTitle: '登录成功',
     loginSuccessTitle: '登录成功',

xjrsoft-vue3/src/views/jcsj/cpxx/components/CpxxModal.vue

@@ -2,12 +2,12 @@
 <template>
 <template>
 
 
 
 
-    <BasicModal 
-    :height="1080"   
+    <BasicModal
+    :height="1080"
      v-bind="$attrs" @register="registerModal" :title="getTitle"
      v-bind="$attrs" @register="registerModal" :title="getTitle"
       @ok="handleSubmit" @cancel="handleClose"  >
       @ok="handleSubmit" @cancel="handleClose"  >
       <ModalForm ref="formRef" v-model:value="state.formModel" :fromPage="FromPageType.MENU" />
       <ModalForm ref="formRef" v-model:value="state.formModel" :fromPage="FromPageType.MENU" />
-      
+
     </BasicModal>
     </BasicModal>
   
   
 </template>
 </template>
@@ -135,4 +135,3 @@
   
   
 </script>
 </script>
 
 
-  
\ No newline at end of file

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

@@ -10,10 +10,10 @@
  </template>
  </template>
  
  
  <template #resizeRight>
  <template #resizeRight>
-<BasicTable @register="registerTable" isMenuTable ref="tableRef"  
-   
+<BasicTable @register="registerTable" isMenuTable ref="tableRef"
+
   >
   >
-       
+
         <template #toolbar>
         <template #toolbar>
           <template v-for="button in tableButtonConfig" :key="button.code">
           <template v-for="button in tableButtonConfig" :key="button.code">
             <a-button v-if="button.isDefault" type="primary" @click="buttonClick(button.code)">
             <a-button v-if="button.isDefault" type="primary" @click="buttonClick(button.code)">
@@ -21,10 +21,10 @@
               {{ button.name }}
               {{ button.name }}
             </a-button>
             </a-button>
             <CustomButtonModal v-else-if="button.buttonType == 'modal'" :info="button" />
             <CustomButtonModal v-else-if="button.buttonType == 'modal'" :info="button" />
-            <a-button v-else :type="button.buttonType === 'danger' ? 'default' : button.buttonType || 'primary'" :danger="button.buttonType === 'danger'" >
-              <template #icon><Icon :icon="button.icon" /></template>
-              {{ button.name }}
-            </a-button>
+<!--            <a-button v-else :type="button.buttonType === 'danger' ? 'default' : button.buttonType || 'primary'" :danger="button.buttonType === 'danger'" >-->
+<!--              <template #icon><Icon :icon="button.icon" /></template>-->
+<!--              {{ button.name }}-->
+<!--            </a-button>-->
           </template>
           </template>
         </template>
         </template>
         <template #bodyCell="{ column, record }">
         <template #bodyCell="{ column, record }">
@@ -36,25 +36,25 @@
                     :disabled="true"
                     :disabled="true"
                   />
                   />
                 </template>
                 </template>
-          
-         
+
+
           <template v-if="column.dataIndex === 'action'">
           <template v-if="column.dataIndex === 'action'">
-          
+
            <TableAction
            <TableAction
               :actions="getLessActions(record)"
               :actions="getLessActions(record)"
               :dropDownActions="getMoreActions(record)"
               :dropDownActions="getMoreActions(record)"
             />
             />
           </template>
           </template>
-          
+
           <template v-else-if="column.dataIndex && column?.listStyle">
           <template v-else-if="column.dataIndex && column?.listStyle">
             <span :style="executeListStyle(getValue(record, column, 'style'), column?.listStyle)">{{
             <span :style="executeListStyle(getValue(record, column, 'style'), column?.listStyle)">{{
               getValue(record, column, 'value')
               getValue(record, column, 'value')
             }}</span>
             }}</span>
           </template>
           </template>
         </template>
         </template>
-        
-           
-        
+
+
+
       </BasicTable>
       </BasicTable>
  </template>
  </template>
  
  
@@ -82,7 +82,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { usePermission } from '/@/hooks/web/usePermission';
   import { usePermission } from '/@/hooks/web/usePermission';
-    import CustomButtonModal from '/@/components/Form/src/components/CustomButtonModal.vue';
+  import CustomButtonModal from '/@/components/Form/src/components/CustomButtonModal.vue';
   import { executeListStyle, getValue } from '/@/hooks/web/useListStyle';//列表样式配置
   import { executeListStyle, getValue } from '/@/hooks/web/useListStyle';//列表样式配置
   import { useRouter } from 'vue-router';
   import { useRouter } from 'vue-router';
   
   
@@ -104,7 +104,7 @@
   
   
   import { searchFormSchema, columns  } from './components/config';
   import { searchFormSchema, columns  } from './components/config';
   import { treeConfig } from './components/config';  
   import { treeConfig } from './components/config';  
-         import {TreeStructure} from '/@/components/TreeStructure';
+  import {TreeStructure} from '/@/components/TreeStructure';
   import Icon from '/@/components/Icon/index';
   import Icon from '/@/components/Icon/index';
    
    
   import { BasicTree, TreeItem } from '/@/components/Tree'; 
   import { BasicTree, TreeItem } from '/@/components/Tree'; 
@@ -136,12 +136,7 @@
 
 
   const filterColumns = filterColumnAuth(columns);
   const filterColumns = filterColumnAuth(columns);
   const tableRef = ref();
   const tableRef = ref();
-  
-
-  
-  
 
 
-  
   //展示在列表内的按钮
   //展示在列表内的按钮
   const actionButtons = ref<string[]>(["view","edit","delete"]);
   const actionButtons = ref<string[]>(["view","edit","delete"]);
   const buttonConfigs = computed(()=>{
   const buttonConfigs = computed(()=>{
@@ -197,17 +192,17 @@
       return pageParamsInfo.value;
       return pageParamsInfo.value;
     },
     },
     afterFetch: (res) => {
     afterFetch: (res) => {
-      
-      
-       
-      
-      
+
+
+
+
+
     },
     },
     useSearchForm: true,
     useSearchForm: true,
     showTableSetting: true,
     showTableSetting: true,
-    
-    
-    
+
+
+
     striped: false,
     striped: false,
     actionColumn: {
     actionColumn: {
       width: 195,
       width: 195,
@@ -428,4 +423,4 @@
   
   
   
   
   
   
-</style>
+</style>
\ No newline at end of file

xjrsoft-vue3/src/views/jcsj/wlqd/components/WlqdModal.vue

@@ -2,8 +2,8 @@
 <template>
 <template>
 
 
 
 
-    <BasicModal 
-    :height="1080"   
+    <BasicModal
+    :height="1080"
      v-bind="$attrs" @register="registerModal" :title="getTitle"
      v-bind="$attrs" @register="registerModal" :title="getTitle"
       @ok="handleSubmit" @cancel="handleClose"  >
       @ok="handleSubmit" @cancel="handleClose"  >
       <ModalForm ref="formRef" v-model:value="state.formModel" :fromPage="FromPageType.MENU" />
       <ModalForm ref="formRef" v-model:value="state.formModel" :fromPage="FromPageType.MENU" />

xjrsoft-vue3/src/views/jcsj/wlqd/components/config.ts

@@ -267,7 +267,7 @@ export const formProps: FormProps = {
                 popupType: 'associate',
                 popupType: 'associate',
                 width: '100%',
                 width: '100%',
                 span: 7,
                 span: 7,
-                placeholder: '请产品名称选择',
+                placeholder: '请选择产品名称',
                 showLabel: true,
                 showLabel: true,
                 disabled: false,
                 disabled: false,
                 datasourceType: 'api',
                 datasourceType: 'api',
@@ -927,7 +927,8 @@ export const formProps: FormProps = {
                     { key: '3', title: 'Body' },
                     { key: '3', title: 'Body' },
                   ],
                   ],
                   script:
                   script:
-                    "if(keyword!=null && keyword!=''){\r\n    var sql = \"select *,id as value,cpmc as label from mes_base_product_info where delete_mark=0 and cpmc like '%${keyword}%' \";\r\n    return db.select(sql)\r\n}\r\nvar sql = 'select *,id as value,cpmc as label from mes_base_product_info where delete_mark=0';\r\nreturn db.select(sql)",
+                    "if(keyword!=null && keyword!=''){\r\n    var sql " +
+                    "= \"select *,id as value,cpmc as label from mes_base_product_info where delete_mark=0 and cpmc like '%${keyword}%' \";\r\n    return db.select(sql)\r\n}\r\nvar sql = 'select *,id as value,cpmc as label from mes_base_product_info where delete_mark=0';\r\nreturn db.select(sql)",
                   outputParams: [
                   outputParams: [
                     { name: 'cpbh', tableTitle: '编号' },
                     { name: 'cpbh', tableTitle: '编号' },
                     { name: 'cpmc', tableTitle: '名称' },
                     { name: 'cpmc', tableTitle: '名称' },

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

@@ -35,23 +35,23 @@
             </template>
             </template>
           </InputPassword>
           </InputPassword>
         </FormItem>
         </FormItem>
-        <FormItem name="code" class="enter-x" v-if="formData.showCaptcha">
-          <label class="form-title"> {{ t('验证码') }}</label>
-          <div style="display: flex">
-            <Input
-              size="large"
-              v-model:value="formData.code"
-              :placeholder="t('验证码')"
-              class="fix-auto-fill"
-              style="height: 58px"
-            />
-            <img
-              :src="formData.captchaImg"
-              style="width: 100%; height: 60px; margin-left: 10px"
-              @click="getImg"
-            />
-          </div>
-        </FormItem>
+<!--        <FormItem name="code" class="enter-x" v-if="formData.showCaptcha">-->
+<!--          <label class="form-title"> {{ t('验证码') }}</label>-->
+<!--          <div style="display: flex">-->
+<!--            <Input-->
+<!--              size="large"-->
+<!--              v-model:value="formData.code"-->
+<!--              :placeholder="t('验证码')"-->
+<!--              class="fix-auto-fill"-->
+<!--              style="height: 58px"-->
+<!--            />-->
+<!--            <img-->
+<!--              :src="formData.captchaImg"-->
+<!--              style="width: 100%; height: 60px; margin-left: 10px"-->
+<!--              @click="getImg"-->
+<!--            />-->
+<!--          </div>-->
+<!--        </FormItem>-->
         <ARow class="enter-x">
         <ARow class="enter-x">
           <ACol :span="12">
           <ACol :span="12">
             <FormItem>
             <FormItem>
@@ -97,16 +97,16 @@
       </ACol>
       </ACol>
     </ARow> -->
     </ARow> -->
 
 
-        <a-divider class="enter-x">{{ t('其他登录方式') }}</a-divider>
+<!--        <a-divider class="enter-x">{{ t('其他登录方式') }}</a-divider>-->
       </div>
       </div>
       <!-- <div style="height: 1000px; width: 800px" v-else>
       <!-- <div style="height: 1000px; width: 800px" v-else>
       <iframe id="iframeId" style="height: 100%; width: 100%" :src="authorizeUrl"></iframe>
       <iframe id="iframeId" style="height: 100%; width: 100%" :src="authorizeUrl"></iframe>
     </div> -->
     </div> -->
 
 
-      <div class="text-center" :class="`${prefixCls}-sign-in-way`">
-        <WechatOutlined @click="oauthLogin('wechat_enterprise')" class="methods-icon mr-5" />
-        <DingdingOutlined @click="oauthLogin('dingtalk')" class="methods-icon" />
-      </div>
+<!--      <div class="text-center" :class="`${prefixCls}-sign-in-way`">-->
+<!--        <WechatOutlined @click="oauthLogin('wechat_enterprise')" class="methods-icon mr-5" />-->
+<!--        <DingdingOutlined @click="oauthLogin('dingtalk')" class="methods-icon" />-->
+<!--      </div>-->
     </Form>
     </Form>
 
 
     <Modal
     <Modal