tangning 6 mesiacov pred
rodič
commit
80cce055aa

+ 5 - 2
src/views/device/putModal.vue

@@ -2,7 +2,7 @@
   <BasicModal
     v-bind="$attrs"
     @register="register"
-    title="设备入库"
+    :title="fileFlow.title"
     @visible-change="handleVisibleChange"
     @cancel="resetFields"
     @ok="handleSubmit"
@@ -23,7 +23,7 @@
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { cameraAllType } from '/@/api/account';
-  import { cameraIn } from '/@/api/device';
+  import { cameraIn, updateCameraType } from '/@/api/device';
   import { companyUploadExcel, downTemplate } from '/@/api/customer';
   import { useI18n } from '/@/hooks/web/useI18n';
   const { t } = useI18n();
@@ -37,6 +37,7 @@
       const modelRef = ref({});
       const fileFlow = reactive({
         file: null,
+        title: '设备入库',
       });
       const { createMessage } = useMessage();
       const schemas: FormSchema[] = [
@@ -183,6 +184,7 @@
 
       function onDataReceive(data) {
         modelRef.value = data;
+        fileFlow.title = data.id ? '编辑' : '设备入库';
         resetFields();
         setFieldsValue({
           type: data.sceneName,
@@ -203,6 +205,7 @@
         });
       }
       const handleSubmit = async () => {
+        modelRef.value
         try {
           const params = await validate();
           await cameraIn(params);

+ 2 - 2
src/views/empower/apilist.vue

@@ -66,7 +66,7 @@
           width: 120,
         },
         {
-          title: '四维看看账',
+          title: '四维看看账',
           ellipsis: true,
           dataIndex: 'userName',
           width: 120,
@@ -184,7 +184,7 @@
           },
           {
             field: 'userName',
-            label: '四维看看账',
+            label: '四维看看账',
             component: 'Input',
             colProps: {
               xl: 8,

+ 1 - 1
src/views/empower/modal/api/AddApiModal.vue

@@ -66,7 +66,7 @@
           componentProps: {
             rows: 4,
           },
-          label: '四维看看账',
+          label: '四维看看账',
           colProps: { span: 20 },
         },
         {

+ 1 - 11
src/views/empower/modal/difference/AddModal.vue

@@ -174,17 +174,7 @@
           let res = await authorizeRtkAdd(apiData);
           closeModal();
           resetFields();
-          createSuccessModal({
-            title: t('layout.setting.operatingTitle'),
-            content: `安装Key:${res.authorizeKey || fileFlow.key}`,
-            okText: '复制',
-            onOk: async () => {
-              // 双击复制
-              copyTextToClipboard(res.authorizeKey || fileFlow.key);
-              createMessage.success('复制成功');
-            },
-          });
-          // createMessage.success(t('common.optSuccess'));
+          createMessage.success(t('common.optSuccess'));
           emit('update');
         } catch (error) {
           console.log('not passing', error);

+ 158 - 0
src/views/order/data.ts

@@ -3,7 +3,165 @@ import { FormSchema } from '/@/components/Form/index';
 import { BasicColumn, FormProps } from '/@/components/Table';
 import { Time } from '/@/components/Time';
 import { h } from 'vue';
+export const localCameraForm: Partial<FormProps> = {
+  labelWidth: 100,
+  autoSubmitOnEnter: true,
+  autoAdvancedLine: 1,
+  actionColOptions: {
+    span: 24,
+  },
+  schemas: [
+    {
+      field: 'timeList',
+      label: '下单时间',
+      component: 'RangePicker',
+      componentProps: {
+        maxLength: 100,
+        format: 'YYYY-MM-DD',
+        valueFormat: 'YYYY-MM-DD',
+      },
+      colProps: {
+        xl: 8,
+        xxl: 8,
+      },
+    },
+    {
+      field: 'orderSn',
+      label: '订单号',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+      },
+      colProps: {
+        xl: 8,
+        xxl: 8,
+      },
+    },
 
+    {
+      field: 'customerType',
+      component: 'Select',
+      label: '客户类别',
+      colProps: {
+        span: 8,
+      },
+      componentProps: {
+        options: [
+          {
+            label: '直销',
+            value: 0,
+            key: '0',
+          },
+          {
+            label: '经销',
+            value: 1,
+            key: '1',
+          },
+        ],
+      },
+    },
+    {
+      field: 'useType',
+      component: 'ApiSelect',
+      label: '使用类型',
+      componentProps: {
+        // filterOption: onFilterOption,
+        // showSearch: true,
+        api: incrementUseTypeList,
+        labelField: 'name',
+        valueField: 'id',
+        immediate: true,
+      },
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      field: 'companyName',
+      component: 'Select',
+      label: '合同所属公司',
+      colProps: {
+        span: 8,
+      },
+      itemProps: {
+        autoLink: false,
+      },
+      componentProps: {
+        options: [
+          {
+            label: '珠海市四维时代网络科技有限公司',
+            value: '珠海市四维时代网络科技有限公司',
+            key: '珠海市四维时代网络科技有限公司',
+          },
+          {
+            label: '广东四维看看智能设备有限公司',
+            value: '广东四维看看智能设备有限公司',
+            key: '广东四维看看智能设备有限公司',
+          },
+          {
+            label: '四维看看(香港)有限公司',
+            value: '四维看看(香港)有限公司',
+            key: '四维看看(香港)有限公司',
+          },
+          {
+            label: '四维看看(北京)数据科技有限公司',
+            value: '四维看看(北京)数据科技有限公司',
+            key: '四维看看(北京)数据科技有限公司',
+          },
+        ],
+      },
+    },
+    {
+      field: 'businessDept',
+      component: 'Select',
+      label: '业务部门',
+      colProps: {
+        span: 8,
+      },
+      itemProps: {
+        autoLink: false,
+      },
+      componentProps: {
+        options: [
+          {
+            label: '数字营销事业部',
+            value: '数字营销事业部',
+            key: '数字营销事业部',
+          },
+          {
+            label: '政企事业部',
+            value: '政企事业部',
+            key: '政企事业部',
+          },
+          {
+            label: '海外事业部',
+            value: '海外事业部',
+            key: '海外事业部',
+          },
+          {
+            label: '市场部',
+            value: '市场部',
+            key: '市场部',
+          },
+          {
+            label: '总经办',
+            value: '总经办',
+            key: '总经办',
+          },
+        ],
+      },
+    },
+    {
+      field: 'amount',
+      component: 'Input',
+      label: '订单金额',
+      colProps: { span: 7 },
+      componentProps: {
+        type: 'number',
+      },
+    },
+  ],
+};
 export const equitySearchForm: Partial<FormProps> = {
   labelWidth: 100,
   autoSubmitOnEnter: true,

+ 2 - 2
src/views/order/localCameraList.vue

@@ -53,7 +53,7 @@
   import { authorizeCameraList, authorizeCameraExport } from '/@/api/order';
   import { downloadByData } from '/@/utils/file/download';
   import { usePermissionStore } from '/@/store/modules/permission';
-  import { localCameraColumns, equitySearchForm } from './data';
+  import { localCameraColumns, localCameraForm } from './data';
   import { copyTextToClipboard } from '/@/hooks/web/useCopyToClipboard';
 
   export default defineComponent({
@@ -77,7 +77,7 @@
         // titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
         columns: localCameraColumns,
         useSearchForm: true,
-        formConfig: equitySearchForm,
+        formConfig: localCameraForm,
         showTableSetting: true,
         showIndexColumn: false,
         rowKey: 'id',