1

src/views/account/details/data.ts

@@ -308,8 +308,8 @@ export const equitySearchForm: Partial<FormProps> = {
         valueFormat: 'YYYY-MM-DD',
       },
       colProps: {
-        xl: 7,
-        xxl: 7,
+        xl: 8,
+        xxl: 8,
       },
     },
     {
@@ -320,8 +320,8 @@ export const equitySearchForm: Partial<FormProps> = {
         maxLength: 100,
       },
       colProps: {
-        xl: 7,
-        xxl: 7,
+        xl: 8,
+        xxl: 8,
       },
     },
     {
@@ -332,8 +332,8 @@ export const equitySearchForm: Partial<FormProps> = {
         maxLength: 100,
       },
       colProps: {
-        xl: 7,
-        xxl: 7,
+        xl: 8,
+        xxl: 8,
       },
     },
     {
@@ -344,7 +344,7 @@ export const equitySearchForm: Partial<FormProps> = {
         maxLength: 100,
       },
       colProps: {
-        span: 7,
+        span: 8,
       },
     },
     {
@@ -352,7 +352,7 @@ export const equitySearchForm: Partial<FormProps> = {
       component: 'Select',
       label: '客户类别',
       colProps: {
-        span: 7,
+        span: 8,
       },
       componentProps: {
         options: [
@@ -382,7 +382,7 @@ export const equitySearchForm: Partial<FormProps> = {
         immediate: true,
       },
       colProps: {
-        span: 7,
+        span: 8,
       },
     },
     {
@@ -390,7 +390,7 @@ export const equitySearchForm: Partial<FormProps> = {
       component: 'Select',
       label: '充值方式',
       colProps: {
-        span: 7,
+        span: 8,
       },
       componentProps: {
         options: [
@@ -408,6 +408,81 @@ export const equitySearchForm: Partial<FormProps> = {
       },
     },
     {
+      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: '订单金额',
@@ -434,8 +509,8 @@ export const orderSearchForm: Partial<FormProps> = {
         maxLength: 100,
       },
       colProps: {
-        xl: 7,
-        xxl: 7,
+        xl: 8,
+        xxl: 8,
       },
     },
     // {
@@ -458,8 +533,8 @@ export const orderSearchForm: Partial<FormProps> = {
         maxLength: 100,
       },
       colProps: {
-        xl: 7,
-        xxl: 7,
+        xl: 8,
+        xxl: 8,
       },
     },
     {
@@ -472,8 +547,8 @@ export const orderSearchForm: Partial<FormProps> = {
         valueFormat: 'YYYY-MM-DD',
       },
       colProps: {
-        xl: 7,
-        xxl: 7,
+        xl: 8,
+        xxl: 8,
       },
     },
   ],
@@ -506,6 +581,30 @@ export const dowmColumns: BasicColumn[] = [
     width: 120,
   },
   {
+    title: '合同所属公司',
+    dataIndex: 'companyName',
+    ellipsis: true,
+    width: 230,
+  },
+  {
+    title: '业务部门',
+    dataIndex: 'businessDept',
+    ellipsis: true,
+    width: 120,
+  },
+  {
+    title: '业务员',
+    dataIndex: 'businessName',
+    ellipsis: true,
+    width: 120,
+  },
+  {
+    title: '客户付款时间',
+    dataIndex: 'customerPayTime',
+    ellipsis: true,
+    width: 160,
+  },
+  {
     title: 'SN码',
     dataIndex: 'snCode',
     width: 120,

src/views/empower/AddInstallModal.vue

@@ -28,6 +28,7 @@
   import { authorizeInstalladdOrUpdate, checkMachineCode } from '/@/api/authorizeModeling';
   import dayjs from 'dayjs';
   import { otherInfoStore } from '/@/store/modules/other';
+  import { incrementUseTypeList } from '/@/api/account';
 
   const { t } = useI18n();
   export default defineComponent({
@@ -68,7 +69,31 @@
 
       const [registerForm, { validate, resetFields, setFieldsValue, updateSchema }] = useForm({
         labelWidth: 120,
-        schemas: [...Addschemas, ...schemas, ...remarkschemas],
+        schemas: [
+          {
+            field: 'useType',
+            component: 'ApiSelect',
+            required: true,
+            label: '使用类型',
+            componentProps: {
+              // filterOption: onFilterOption,
+              // showSearch: true,
+              api: incrementUseTypeList,
+              labelField: 'name',
+              valueField: 'id',
+              immediate: true,
+            },
+            itemProps: {
+              autoLink: false,
+            },
+            colProps: {
+              span: 20,
+            },
+          },
+          ...Addschemas,
+          ...schemas,
+          ...remarkschemas,
+        ],
         showActionButtonGroup: false,
         actionColOptions: {
           span: 24,
@@ -107,7 +132,7 @@
       }
       async function handleConfirm() {
         const { id, machineCode } = await validate();
-        let res = await checkMachineCode({ machineCode:machineCode.replace(/\s*/g,"") });
+        let res = await checkMachineCode({ machineCode: machineCode.replace(/\s*/g, '') });
         console.log('res', res, !id);
         if (!id && res && res.id) {
           createConfirm({
@@ -136,8 +161,8 @@
           console.log('validate', params);
           const apiData = {
             ...params,
-            snCodes:params.snCodes && params.snCodes.replace(/\s*/g,""),
-            machineCode:params.machineCode.replace(/\s*/g,""),
+            snCodes: params.snCodes && params.snCodes.replace(/\s*/g, ''),
+            machineCode: params.machineCode.replace(/\s*/g, ''),
             userId: params.id,
           };
           let res = await authorizeInstalladdOrUpdate(apiData);

src/views/empower/AddModal.vue

@@ -20,7 +20,7 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { remarkschemas, Addschemas } from "./data";
+  import { remarkschemas, Addschemas } from './data';
   import { InvoiceRegister } from '/@/api/order';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { uploadApi } from '/@/api/product/index';
@@ -28,6 +28,7 @@
   import { authorizeModelingaddOrUpdate } from '/@/api/authorizeModeling';
   import dayjs from 'dayjs';
   import { otherInfoStore } from '/@/store/modules/other';
+  import { incrementUseTypeList } from '/@/api/account';
 
   const { t } = useI18n();
   export default defineComponent({
@@ -113,7 +114,31 @@
 
       const [registerForm, { validate, resetFields, setFieldsValue, updateSchema }] = useForm({
         labelWidth: 120,
-        schemas: [...Addschemas, ...schemas, ...remarkschemas],
+        schemas: [
+          {
+            field: 'useType',
+            component: 'ApiSelect',
+            required: true,
+            label: '使用类型',
+            componentProps: {
+              // filterOption: onFilterOption,
+              // showSearch: true,
+              api: incrementUseTypeList,
+              labelField: 'name',
+              valueField: 'id',
+              immediate: true,
+            },
+            itemProps: {
+              autoLink: false,
+            },
+            colProps: {
+              span: 20,
+            },
+          },
+          ...Addschemas,
+          ...schemas,
+          ...remarkschemas,
+        ],
         showActionButtonGroup: false,
         actionColOptions: {
           span: 24,

src/views/empower/camera.vue

@@ -40,17 +40,8 @@
 </template>
 <script lang="ts">
   import { defineComponent, h } from 'vue';
-  import {
-    BasicTable,
-    useTable,
-    TableAction,
-    BasicColumn,
-    FormProps,
-  } from '/@/components/Table';
-  import {
-    authorizeCameraList,
-    authorizeCameradelete,
-  } from '/@/api/authorizeModeling';
+  import { BasicTable, useTable, TableAction, BasicColumn, FormProps } from '/@/components/Table';
+  import { authorizeCameraList, authorizeCameradelete } from '/@/api/authorizeModeling';
   import { useModal } from '/@/components/Modal';
   import { useI18n } from '/@/hooks/web/useI18n';
   import AddModal from './AddCameraModal.vue';
@@ -79,22 +70,26 @@
           dataIndex: 'companyName',
           ellipsis: true,
           width: 230,
-        },{
+        },
+        {
           title: '业务部门',
           dataIndex: 'businessDept',
           ellipsis: true,
           width: 120,
-        },{
+        },
+        {
           title: '业务员',
           dataIndex: 'businessName',
           ellipsis: true,
           width: 120,
-        },{
+        },
+        {
           title: '客户付款时间',
           dataIndex: 'customerPayTime',
           ellipsis: true,
           width: 160,
-        },{
+        },
+        {
           title: '客户名称',
           dataIndex: 'customerName',
           ellipsis: true,
@@ -231,6 +226,81 @@
             },
           },
           {
+            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: 'machineCode',
             label: '机器码',
             component: 'Input',