tangning 5 дней назад
Родитель
Сommit
88e7ef0559

+ 1 - 1
src/views/draw/list.vue

@@ -44,7 +44,7 @@
                 },
                 {
                   label: '编辑',
-                  ifShow: getTypeCheckPerm('overview-edit'),
+                  ifShow: getTypeCheckPerm('overview-edit') && record.oldData != 1,
                   onClick: handlegotoEdit.bind(null, record),
                 },
                 {

+ 11 - 2
src/views/lanUser/adddetailsModal.vue

@@ -27,6 +27,7 @@
           />
         </template>
       </BasicForm>
+      <Checkbox style="margin-left: 120px" v-model:checked="mvData" size="small">同时迁移该用户原平台所有数据</Checkbox>
       <div v-if="addData.type == 2">
         <div class="from" v-if="active && active.name">
           <div class="form-item"> <div>姓名</div>{{ active.name }} </div>
@@ -50,6 +51,7 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { useI18n } from '/@/hooks/web/useI18n';
+  import { Checkbox } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useUserStore } from '/@/store/modules/user';
   import { debounce } from 'lodash-es';
@@ -58,7 +60,7 @@
   import { addWaitUser, jyUserPlatformadd, queryByKey } from '/@/api/jyUserPlatform/index';
   const { t } = useI18n();
   export default defineComponent({
-    components: { BasicModal, BasicForm, Select },
+    components: { BasicModal, BasicForm, Select, Checkbox },
     props: {
       userData: { type: Object },
     },
@@ -66,6 +68,7 @@
     setup(_, context) {
       const modelRef = ref(undefined);
       const active = ref({});
+      const mvData = ref(false);
       const addData = ref({
         type: 1,
         name: '',
@@ -208,6 +211,7 @@
       });
       function onDataReceive(data) {
         console.log('onDataReceive', data);
+        mvData.value = false;
         setFieldsValue({
           type: 1,
           idkey: null,
@@ -297,6 +301,7 @@
         let param = await validate()
         let res = await jyUserPlatformadd({
           ...active.value,
+          mvData: mvData.value ? 1 : 0,
         });
         context && context.emit('ok', res);
         createMessage.success(t('common.optSuccess'));
@@ -309,7 +314,10 @@
        }
       async function handleAddUser() {
         let param = await validate()
-        let res = await addWaitUser(param);
+        let res = await addWaitUser({
+          ...param,
+          mvData: mvData.value ? 0 : 1,
+        });
         context && context.emit('ok', res);
         createMessage.success(t('common.optSuccess'));
         closeModal();
@@ -406,6 +414,7 @@
         handlestd,
         addData,
         registerForm,
+        mvData,
         handleAddUserqr,
       };
     },

+ 8 - 2
src/views/lanUser/batchPutModal.vue

@@ -14,7 +14,8 @@
           {{ model[field] }}
         </template>
       </BasicForm>
-      <a @click="getTemplate" style="padding: 20px 0 0 80px">下载批量导入模板</a>
+      <a @click="getTemplate" style="padding: 20px 0 10px 80px">下载批量导入模板</a>
+      <Checkbox style="margin-left: 80px" v-model:checked="mvData" size="small">同时迁移该用户原平台所有数据</Checkbox>
     </div>
   </BasicModal>
 </template>
@@ -23,19 +24,21 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { Checkbox } from 'ant-design-vue';
   // import { sceneMove } from '/@/api/operate';
   import { companyUploadExcel, downTemplate } from '/@/api/customer';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { downloadByData } from '/@/utils/file/download'
   const { t } = useI18n();
   export default defineComponent({
-    components: { BasicModal, BasicForm },
+    components: { BasicModal, BasicForm, Checkbox },
     props: {
       userData: { type: Object },
     },
     emits: ['update', 'register'],
     setup(props, { emit }) {
       const modelRef = ref({});
+      const mvData = ref(false);
       const fileFlow = reactive({
         file: null,
       });
@@ -82,6 +85,7 @@
       let addListFunc = () => {};
       const [register, { closeModal }] = useModalInner((data) => {
         // console.log(data);
+        mvData.value = false
         data && onDataReceive(data);
       });
 
@@ -99,6 +103,7 @@
             file: fileFlow.file,
             data:{
               type: 6,
+              mvData: mvData.value?1:0
             }
           };
           const res = await companyUploadExcel(apiData);
@@ -134,6 +139,7 @@
         addListFunc,
         resetFields,
         t,
+        mvData,
         getTemplate,
       };
     },

+ 1 - 2
src/views/productOperation/modal/PowersModal.vue

@@ -47,8 +47,7 @@
         </template>
       </BasicTable>
       <div style="margin-left: 16px" v-if="!(caseId||fusionId)">
-        上级单位平台管理员可见
-      <Checkbox v-model:checked="supAuthRef" size="small"></Checkbox>
+      <Checkbox v-model:checked="supAuthRef" size="small">省级单位平台管理员可见(若无省级平台请忽略,若有场景密码则此密码生效)</Checkbox>
       </div>
       <detailModal @register="registerDetail" @update="reload" />
       <ryNoSceneModal @register="registerryNoModal" @update="reload" />